Merge Source/NSAttributedString.m

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/branches/gnustep_testplant_branch@38661 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Marcian Lytwyn 2015-06-20 16:30:25 +00:00
parent ad6b2849a7
commit 630073e694

View file

@ -1559,6 +1559,7 @@ static NSMutableDictionary *cachedCSets = nil;
NSUInteger start;
unichar chars[64];
CREATE_AUTORELEASE_POOL(pool);
NSCharacterSet *controlset = [NSCharacterSet controlCharacterSet];
if (NSMaxRange (range) > [self length])
{
@ -1610,7 +1611,8 @@ static NSMutableDictionary *cachedCSets = nil;
}
if (charset != nil && ![charset characterIsMember: uchar]
&& (uchar > 31))
&& (uchar != NSAttachmentCharacter)
&& ![controlset characterIsMember: uchar])
{
// Find a replacement font
NSFont *subFont;