Remove caching in nsfont.m, the general code does it (I misunderstood).

* nsfont.m (Vfonts_in_cache): Remove, not needed as font.c handles
caching.
(nsfont_open): Remove setting of Vfonts_in_cache.
(syms_of_nsfont): Remove initialization of Vfonts_in_cache

diff --git a/src/ChangeLog b/src/ChangeLog
index d83e3430594a087fc182a965c4a2bee23d5a4539..392825757aed2212382836276762b1937890fbd5 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,10 @@
+2012-10-09  Jan Djärv  <jan.h.d@swipnet.se>
+
+       * nsfont.m (Vfonts_in_cache): Remove, not needed as font.c handles
+       caching.
+       (nsfont_open): Remove setting of Vfonts_in_cache.
+       (syms_of_nsfont): Remove initialization of Vfonts_in_cache
+
 2012-10-09  Eli Zaretskii  <eliz@gnu.org>
 
        * w32fns.c (w32_last_error): Change the return value to DWORD, to

diff --git a/src/nsfont.m b/src/nsfont.m
index 20a8f5d402855ea69b306d365714b86461b4740b..a820b60ac58f9d261b26543e83b9d6793cd731a5 100644 (file)
--- a/src/nsfont.m
+++ b/src/nsfont.m
@@ -53,8 +53,6 @@ extern float ns_antialias_threshold;
 extern int ns_tmp_flags;
 extern struct nsfont_info *ns_tmp_font;
 
-static Lisp_Object Vfonts_in_cache;
-
 
 /* font glyph and metrics caching functions, implemented at end */
 static void ns_uni_to_glyphs (struct nsfont_info *font_info,
@@ -815,7 +813,6 @@ nsfont_open (FRAME_PTR f, Lisp_Object font_entity, int pixel_size)
                                   numberWithUnsignedLongLong:
                                     (unsigned long long) XHASH (font_object)]
                         forKey: nsfont];
-          Vfonts_in_cache = Fcons (font_object, Vfonts_in_cache);
         }
     }
 
@@ -1535,7 +1532,4 @@ syms_of_nsfont (void)
                doc: /* Internal use: maps font registry to Unicode script. */);
 
   ascii_printable = NULL;
-
-  Vfonts_in_cache = Qnil;
-  staticpro (&Vfonts_in_cache);
 }