gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-05-31 00:30:53 +00:00
Code Issues Projects Releases Packages Wiki Activity

* Source/NSString.m: Fix for ICU anchored backwards search

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@34868 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
ericwa 2012-03-02 22:01:10 +00:00
parent 311cfb5b8c
commit 9b8f114702
2 changed files with 10 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -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> 2012-03-02 Fred Kiefer <FredKiefer@gmx.de>
* Source/GSLocale.m (GSDefaultLanguageLocale): Add missing check * Source/GSLocale.m (GSDefaultLanguageLocale): Add missing check

11
Source/NSString.m
View file

@ -2154,14 +2154,15 @@ handle_printf_atsign (FILE *stream,
{ {
if ((mask & NSAnchoredSearch) == NSAnchoredSearch) if ((mask & NSAnchoredSearch) == NSAnchoredSearch)
{ {
if ((mask & NSBackwardsSearch) == NSBackwardsSearch if ((mask & NSBackwardsSearch) == NSBackwardsSearch)
&& (matchLocation + matchLength == NSMaxRange(aRange)))
{ {
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 else