[Emacs-diffs] /srv/bzr/emacs/trunk r110492: Remove caching in nsfont.m, the general code does it (I misunderstood).

[Jan D.]

------------------------------------------------------------
revno: 110492
committer: Jan D. <address@hidden>
branch nick: trunk
timestamp: Tue 2012-10-09 20:33:01 +0200
message:
  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
modified:
  src/ChangeLog
  src/nsfont.m

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2012-10-09 18:10:16 +0000
+++ b/src/ChangeLog     2012-10-09 18:33:01 +0000
@@ -1,3 +1,10 @@
+2012-10-09  Jan Djärv  <address@hidden>
+
+       * 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  <address@hidden>
 
        * w32fns.c (w32_last_error): Change the return value to DWORD, to

=== modified file 'src/nsfont.m'
--- a/src/nsfont.m      2012-10-08 18:31:39 +0000
+++ b/src/nsfont.m      2012-10-09 18:33:01 +0000
@@ -53,8 +53,6 @@
 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 @@
                                   numberWithUnsignedLongLong:
                                     (unsigned long long) XHASH (font_object)]
                         forKey: nsfont];
-          Vfonts_in_cache = Fcons (font_object, Vfonts_in_cache);
         }
     }
 
@@ -1535,7 +1532,4 @@
                doc: /* Internal use: maps font registry to Unicode script. */);
 
   ascii_printable = NULL;
-
-  Vfonts_in_cache = Qnil;
-  staticpro (&Vfonts_in_cache);
 }