From 9b8f114702438e4b2228e381f6d3c1d37078f794 Mon Sep 17 00:00:00 2001
From: ericwa <ericwa@72102866-910b-0410-8b05-ffd578937521>
Date: Fri, 2 Mar 2012 22:01:10 +0000
Subject: [PATCH] * Source/NSString.m: Fix for ICU anchored backwards search

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@34868 72102866-910b-0410-8b05-ffd578937521
---
 ChangeLog         |  4 ++++
 Source/NSString.m | 11 ++++++-----
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 3a1416938..4fd3bd0ea 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2012-03-02  Eric Wasylishen  <ewasylishen@gmail.com>
+
+	* Source/NSString.m: Fix for ICU anchored backwards search
+
 2012-03-02  Fred Kiefer <FredKiefer@gmx.de>
 
 	* Source/GSLocale.m (GSDefaultLanguageLocale): Add missing check
diff --git a/Source/NSString.m b/Source/NSString.m
index a695543d4..a117f4be4 100644
--- a/Source/NSString.m
+++ b/Source/NSString.m
@@ -2154,14 +2154,15 @@ handle_printf_atsign (FILE *stream,
 		{
 		  if ((mask & NSAnchoredSearch) == NSAnchoredSearch)
 		    {
-		      if ((mask & NSBackwardsSearch) == NSBackwardsSearch
-			&& (matchLocation + matchLength == NSMaxRange(aRange)))
+		      if ((mask & NSBackwardsSearch) == NSBackwardsSearch)
 			{
-			  result = NSMakeRange(matchLocation, matchLength);
+			  if (matchLocation + matchLength == NSMaxRange(aRange))
+			    result = NSMakeRange(matchLocation, matchLength);
 			}
-		      else if (matchLocation == 0)
+		      else
 			{
-			  result = NSMakeRange(matchLocation, matchLength);
+			  if (matchLocation == 0)
+			    result = NSMakeRange(matchLocation, matchLength);
 			}
 		    }
 		  else