Author: mlytwyn
Date: Sat Jun 20 18:30:25 2015
New Revision: 38661
URL: http://svn.gna.org/viewcvs/gnustep?rev=38661&view=rev
Log:
Merge Source/NSAttributedString.m
Modified:
libs/gui/branches/gnustep_testplant_branch/Source/NSAttributedString.m
Modified: libs/gui/branches/gnustep_testplant_branch/Source/NSAttributedString.m
URL:
http://svn.gna.org/viewcvs/gnustep/libs/gui/branches/gnustep_testplant_branch/Source/NSAttributedString.m?rev=38661&r1=38660&r2=38661&view=diff
==============================================================================
--- libs/gui/branches/gnustep_testplant_branch/Source/NSAttributedString.m
(original)
+++ libs/gui/branches/gnustep_testplant_branch/Source/NSAttributedString.m
Sat Jun 20 18:30:25 2015
@@ -1559,6 +1559,7 @@
NSUInteger start;
unichar chars[64];
CREATE_AUTORELEASE_POOL(pool);
+ NSCharacterSet *controlset = [NSCharacterSet controlCharacterSet];
if (NSMaxRange (range) > [self length])
{
@@ -1610,7 +1611,8 @@
}
if (charset != nil && ![charset characterIsMember: uchar]
- && (uchar > 31))
+ && (uchar != NSAttachmentCharacter)
+ && ![controlset characterIsMember: uchar])
{
// Find a replacement font
NSFont *subFont;
_______________________________________________
Gnustep-cvs mailing list
Gnustep-cvs@gna.org
https://mail.gna.org/listinfo/gnustep-cvs
