[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/src/nsfont.m,v
From: |
Adrian Robert |
Subject: |
[Emacs-diffs] Changes to emacs/src/nsfont.m,v |
Date: |
Sat, 19 Jul 2008 17:13:50 +0000 |
CVSROOT: /sources/emacs
Module name: emacs
Changes by: Adrian Robert <arobert> 08/07/19 17:13:50
Index: nsfont.m
===================================================================
RCS file: /sources/emacs/emacs/src/nsfont.m,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- nsfont.m 19 Jul 2008 17:01:36 -0000 1.6
+++ nsfont.m 19 Jul 2008 17:13:48 -0000 1.7
@@ -150,7 +150,7 @@
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 @@
}
[suffix release];
+ free (escapedFamily);
return font_entity;
}
@@ -1226,7 +1227,7 @@
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 @@
SDATA (SYMBOL_NAME (scripts[i])));
Fset_fontset_font (name, scripts[i], famAndReg, Qnil, Qnil);
+ free (family);
}
else
{
- [Emacs-diffs] Changes to emacs/src/nsfont.m,v, Miles Bader, 2008/07/15
- [Emacs-diffs] Changes to emacs/src/nsfont.m,v, Miles Bader, 2008/07/15
- [Emacs-diffs] Changes to emacs/src/nsfont.m,v, Glenn Morris, 2008/07/15
- [Emacs-diffs] Changes to emacs/src/nsfont.m,v, Stefan Monnier, 2008/07/16
- [Emacs-diffs] Changes to emacs/src/nsfont.m,v, Adrian Robert, 2008/07/19
- [Emacs-diffs] Changes to emacs/src/nsfont.m,v,
Adrian Robert <=
- [Emacs-diffs] Changes to emacs/src/nsfont.m,v, Adrian Robert, 2008/07/19
- [Emacs-diffs] Changes to emacs/src/nsfont.m,v, Adrian Robert, 2008/07/22