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
This commit is contained in:
Jan Djärv 2012-10-09 20:33:01 +02:00
parent b15736e6e3
commit 5683d7cd9d
2 changed files with 7 additions and 6 deletions

View file

@ -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

View file

@ -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 @@ when setting family in ns_spec_to_descriptor(). */
numberWithUnsignedLongLong:
(unsigned long long) XHASH (font_object)]
forKey: nsfont];
Vfonts_in_cache = Fcons (font_object, Vfonts_in_cache);
}
}
@ -1535,7 +1532,4 @@ - (void)setIntAttribute: (NSInteger)attributeTag value: (NSInteger)val
doc: /* Internal use: maps font registry to Unicode script. */);
ascii_printable = NULL;
Vfonts_in_cache = Qnil;
staticpro (&Vfonts_in_cache);
}