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

Source/GSAttributedString.m

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@13136 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
pyr 2002-03-17 20:04:20 +00:00
parent f97b7c075b
commit bfb4315450
2 changed files with 10 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
2002-03-17 Pierre-Yves Rivaille <pyrivail@ens-lyon.fr>
* Source/GSAttributedString.m
([GSMutableAttributedString -replaceCharactersInRange:withString:]):
Only keep attribute #0 when removing it would remove all attributes.
(patch by Alexander Malmberg)
2002-03-16 Adam Fedor <fedor@gnu.org> 2002-03-16 Adam Fedor <fedor@gnu.org>
* configure.in: Also configure SSL. * configure.in: Also configure SSL.

21
Source/GSAttributedString.m
View file

@ -825,23 +825,8 @@ SANITY();
} }
else else
{ {
if (arrayIndex != 0) REMOVEAT(arrayIndex);
{ arraySize--;
REMOVEAT(arrayIndex);
arraySize--;
}
else
{
NSDictionary *d = blank;
unCacheAttributes(info->attrs);
DESTROY(info->attrs);
d = cacheAttributes(d);
info->attrs = d;
/* set location so it will be correct after being modified
below */
info->loc = NSMaxRange(range);
}
} }
} }
@ -860,7 +845,7 @@ SANITY();
&& effectiveRange.length == range.length) && effectiveRange.length == range.length)
{ {
arrayIndex--; arrayIndex--;
if (arrayIndex!=0) if (arrayIndex!=0 || arraySize > 1)
{ {
REMOVEAT(arrayIndex); REMOVEAT(arrayIndex);
arraySize--; arraySize--;