aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Djärv2011-12-22 14:58:40 +0100
committerJan Djärv2011-12-22 14:58:40 +0100
commit5ccaba1fdb812151ebc7040d14fd3c2aaaba4bca (patch)
tree419463aa487be6685dc458f26215fee040579e1b
parentd031f2c7b72ba418abc4bc9622a25bd4fa7d8a6c (diff)
downloademacs-5ccaba1fdb812151ebc7040d14fd3c2aaaba4bca.tar.gz
emacs-5ccaba1fdb812151ebc7040d14fd3c2aaaba4bca.zip
* nsfont.m (ns_spec_to_descriptor): Do not autorelease fdesc.
-rw-r--r--src/ChangeLog4
-rw-r--r--src/nsfont.m1
2 files changed, 4 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index e40a7f3fbe0..87750228f43 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
12011-12-22 Jan Djärv <jan.h.d@swipnet.se>
2
3 * nsfont.m (ns_spec_to_descriptor): Do not autorelease fdesc.
4
12011-12-21 Jan Djärv <jan.h.d@swipnet.se> 52011-12-21 Jan Djärv <jan.h.d@swipnet.se>
2 6
3 * nsterm.m (x_free_frame_resources): Release 7 * nsterm.m (x_free_frame_resources): Release
diff --git a/src/nsfont.m b/src/nsfont.m
index 080af447b0a..eb57f5e5953 100644
--- a/src/nsfont.m
+++ b/src/nsfont.m
@@ -155,7 +155,6 @@ ns_spec_to_descriptor (Lisp_Object font_spec)
155 if (family != nil) 155 if (family != nil)
156 { 156 {
157 fdesc = [fdesc fontDescriptorWithFamily: family]; 157 fdesc = [fdesc fontDescriptorWithFamily: family];
158 [fdesc autorelease];
159 } 158 }
160 159
161 [fdAttrs release]; 160 [fdAttrs release];