diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 7 | ||||
| -rw-r--r-- | src/nsfont.m | 6 |
2 files changed, 7 insertions, 6 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index d83e3430594..392825757ae 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,10 @@ | |||
| 1 | 2012-10-09 Jan Djärv <jan.h.d@swipnet.se> | ||
| 2 | |||
| 3 | * nsfont.m (Vfonts_in_cache): Remove, not needed as font.c handles | ||
| 4 | caching. | ||
| 5 | (nsfont_open): Remove setting of Vfonts_in_cache. | ||
| 6 | (syms_of_nsfont): Remove initialization of Vfonts_in_cache | ||
| 7 | |||
| 1 | 2012-10-09 Eli Zaretskii <eliz@gnu.org> | 8 | 2012-10-09 Eli Zaretskii <eliz@gnu.org> |
| 2 | 9 | ||
| 3 | * w32fns.c (w32_last_error): Change the return value to DWORD, to | 10 | * w32fns.c (w32_last_error): Change the return value to DWORD, to |
diff --git a/src/nsfont.m b/src/nsfont.m index 20a8f5d4028..a820b60ac58 100644 --- a/src/nsfont.m +++ b/src/nsfont.m | |||
| @@ -53,8 +53,6 @@ extern float ns_antialias_threshold; | |||
| 53 | extern int ns_tmp_flags; | 53 | extern int ns_tmp_flags; |
| 54 | extern struct nsfont_info *ns_tmp_font; | 54 | extern struct nsfont_info *ns_tmp_font; |
| 55 | 55 | ||
| 56 | static Lisp_Object Vfonts_in_cache; | ||
| 57 | |||
| 58 | 56 | ||
| 59 | /* font glyph and metrics caching functions, implemented at end */ | 57 | /* font glyph and metrics caching functions, implemented at end */ |
| 60 | static void ns_uni_to_glyphs (struct nsfont_info *font_info, | 58 | 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) | |||
| 815 | numberWithUnsignedLongLong: | 813 | numberWithUnsignedLongLong: |
| 816 | (unsigned long long) XHASH (font_object)] | 814 | (unsigned long long) XHASH (font_object)] |
| 817 | forKey: nsfont]; | 815 | forKey: nsfont]; |
| 818 | Vfonts_in_cache = Fcons (font_object, Vfonts_in_cache); | ||
| 819 | } | 816 | } |
| 820 | } | 817 | } |
| 821 | 818 | ||
| @@ -1535,7 +1532,4 @@ syms_of_nsfont (void) | |||
| 1535 | doc: /* Internal use: maps font registry to Unicode script. */); | 1532 | doc: /* Internal use: maps font registry to Unicode script. */); |
| 1536 | 1533 | ||
| 1537 | ascii_printable = NULL; | 1534 | ascii_printable = NULL; |
| 1538 | |||
| 1539 | Vfonts_in_cache = Qnil; | ||
| 1540 | staticpro (&Vfonts_in_cache); | ||
| 1541 | } | 1535 | } |