procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

nsfont.m: duplicate UTF8Strings before modifying with nsfont_escape_family_name - patch due to Seiji Zenitani

Browse source
This commit is contained in:
Adrian Robert 2008-07-19 17:13:48 +00:00
parent 45d325c4d1
commit c0230162c8
2 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/ChangeLog
View file

@ -1,3 +1,9 @@
2008-07-19 Adrian Robert <Adrian.B.Robert@gmail.com>
* nsfont.m (nsfont_fmember_to_entity, nsfont_make_fontset_for_font):
strdup() the family UTF8String before modifying it. Patch due to
Seiji Zenitani.
2008-07-19 Adrian Robert <Adrian.B.Robert@gmail.com>
* nsfns.m (ns_set_background_color): Apply patch from Chong Yidong to

6
src/nsfont.m
View file

@ -150,7 +150,7 @@ static void ns_glyph_metrics (struct nsfont_info *font_info,
unsigned int traits = [[famMember objectAtIndex: 3] unsignedIntValue];
/* NSString *psName = [famMember objectAtIndex: 0]; */
NSMutableString *suffix = [[famMember objectAtIndex: 1] mutableCopy];
char *escapedFamily = [family UTF8String];
char *escapedFamily = strdup ([family UTF8String]);
nsfont_escape_name (escapedFamily);
[suffix replaceOccurrencesOfString: @" " withString: @"" options: 0
@ -181,6 +181,7 @@ static void ns_glyph_metrics (struct nsfont_info *font_info,
}
[suffix release];
free (escapedFamily);
return font_entity;
}
@ -1226,7 +1227,7 @@ void nsfont_make_fontset_for_font (Lisp_Object name, Lisp_Object font_object)
if (cfont != nil)
{
char *family = [[cfont familyName] UTF8String];
char *family = strdup([[cfont familyName] UTF8String]);
Lisp_Object famAndReg;
nsfont_escape_name (family);
@ -1238,6 +1239,7 @@ void nsfont_make_fontset_for_font (Lisp_Object name, Lisp_Object font_object)
SDATA (SYMBOL_NAME (scripts[i])));
Fset_fontset_font (name, scripts[i], famAndReg, Qnil, Qnil);
free (family);
}
else
{