* 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
This commit is contained in:
Eric Wasylishen 2012-03-02 22:01:10 +00:00
parent fd8ffb6e42
commit 90460a40cf
2 changed files with 10 additions and 5 deletions

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>
* Source/GSLocale.m (GSDefaultLanguageLocale): Add missing check

View file

@ -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