Merge branch 'master' of ssh://github.com/gnustep/libs-base

Conflicts:
	Source/GSAttributedString.m
This commit is contained in:
Richard Frith-Macdonald 2020-03-11 09:05:44 +00:00
commit 4a7325b00e

View file

@ -684,7 +684,7 @@ SANITY();
unsigned arrayIndex = 0;
unsigned arraySize;
// Initial value unused; set by _attributesAtIndexEffectiveRange
NSRange effectiveRange = NSMakeRange(0, NSNotFound);
NSRange effectiveRange = NSMakeRange(NSNotFound, 0);
unsigned afterRangeLoc, beginRangeLoc;
NSDictionary *attrs;
NSZone *z = [self zone];
@ -797,7 +797,7 @@ SANITY();
unsigned arrayIndex = 0;
unsigned arraySize;
// Initial value unused; set by _attributesAtIndexEffectiveRange
NSRange effectiveRange = NSMakeRange(0, NSNotFound);
NSRange effectiveRange = NSMakeRange(NSNotFound, 0);
GSAttrInfo *info;
int moveLocations;
unsigned start;