diff options
| author | Jan Djärv <jan.h.d@swipnet.se> | 2013-05-14 11:34:16 +0200 |
|---|---|---|
| committer | Jan Djärv <jan.h.d@swipnet.se> | 2013-05-14 11:34:16 +0200 |
| commit | 8fdeaad563abf86083da6e50e2619291b7d1e455 (patch) | |
| tree | 8ad7722eeb2dc43fcc1073b6731d0b647805c304 /src/nsfont.m | |
| parent | 469bfed936a2477c49c24325734a9e8af926bc9f (diff) | |
| download | emacs-8fdeaad563abf86083da6e50e2619291b7d1e455.tar.gz | |
* nsfont.m (ns_spec_to_descriptor): Retain and autorelease fdesc.
Fixes: debbugs:14375
Diffstat (limited to 'src/nsfont.m')
| -rw-r--r-- | src/nsfont.m | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/nsfont.m b/src/nsfont.m index ebee363651f..9ab369d1fcd 100644 --- a/src/nsfont.m +++ b/src/nsfont.m @@ -151,10 +151,13 @@ ns_spec_to_descriptor (Lisp_Object font_spec) if ([tdict count] > 0) [fdAttrs setObject: tdict forKey: NSFontTraitsAttribute]; - fdesc = [NSFontDescriptor fontDescriptorWithFontAttributes: fdAttrs]; + fdesc = [[[NSFontDescriptor fontDescriptorWithFontAttributes: fdAttrs] + retain] autorelease]; + if (family != nil) { - fdesc = [fdesc fontDescriptorWithFamily: family]; + NSFontDescriptor *fdesc2 = [fdesc fontDescriptorWithFamily: family]; + fdesc = [[fdesc2 retain] autorelease]; } [fdAttrs release]; |