gnustep/libs-gui
0
0
Fork 0
mirror of https://github.com/gnustep/libs-gui.git synced 2025-05-31 09:30:48 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge with trunk revision 40072

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/branches/gnustep_testplant_branch@40131 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Marcian Lytwyn 2016-10-05 21:18:43 +00:00
parent fd11511309
commit ab97ddee5f
9 changed files with 12 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Source/NSFontDescriptor.m
View file

@ -2,7 +2,7 @@
<abstract>The font descriptor class</abstract>
Copyright (C) 2007 Free Software Foundation, Inc.
Copyright (C) 2007-2016 Free Software Foundation, Inc.
Author: H. Nikolaus Schaller <hns@computer.org>
Date: 2006
@ -268,7 +268,7 @@
withString: @""
options: 0
range: NSMakeRange(0, [family length])];
if ([face isEqualToString: @"Regular"])
if (!face || [face isEqualToString: @"Regular"])
return family;
return [NSString stringWithFormat: @"%@-%@", family, face];
}