diff options
| author | Chong Yidong | 2012-10-23 10:39:13 +0800 |
|---|---|---|
| committer | Chong Yidong | 2012-10-23 10:39:13 +0800 |
| commit | 49238e7f5c081b841bdc57d96599c4997dcb487c (patch) | |
| tree | d29f99205bd99e7c6e19f810bd11eeac6ca1fb65 /src | |
| parent | 1fb3aa3fead098e7df1428c7a70e3a32f1da23e4 (diff) | |
| download | emacs-49238e7f5c081b841bdc57d96599c4997dcb487c.tar.gz emacs-49238e7f5c081b841bdc57d96599c4997dcb487c.zip | |
Make unused variable font-list-limit obsolete, and move it out of C.
* display.texi (Font Lookup): Remove font-list-limit.
* lisp/startup.el (command-line):
* lisp/cus-start.el: Don't refer to font-list-limit.
* lisp/faces.el (font-list-limit): Define as an obsolete variable.
* xfaces.c (Vfont_list_limit): Move unused variable to faces.el.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/xfaces.c | 8 |
2 files changed, 4 insertions, 8 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 6fe7de51293..644cbc47bfe 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2012-10-23 Chong Yidong <cyd@gnu.org> | ||
| 2 | |||
| 3 | * xfaces.c (Vfont_list_limit): Move unused variable to faces.el. | ||
| 4 | |||
| 1 | 2012-10-21 Jan Djärv <jan.h.d@swipnet.se> | 5 | 2012-10-21 Jan Djärv <jan.h.d@swipnet.se> |
| 2 | 6 | ||
| 3 | * nsfont.m (nsfont_open, ns_glyph_metrics): Force integer advancement | 7 | * nsfont.m (nsfont_open, ns_glyph_metrics): Force integer advancement |
diff --git a/src/xfaces.c b/src/xfaces.c index eb9d2dc9f04..221387c4b6d 100644 --- a/src/xfaces.c +++ b/src/xfaces.c | |||
| @@ -371,8 +371,6 @@ Lisp_Object Vface_alternative_font_registry_alist; | |||
| 371 | 371 | ||
| 372 | static Lisp_Object Qscalable_fonts_allowed; | 372 | static Lisp_Object Qscalable_fonts_allowed; |
| 373 | 373 | ||
| 374 | #define DEFAULT_FONT_LIST_LIMIT 100 | ||
| 375 | |||
| 376 | /* The symbols `foreground-color' and `background-color' which can be | 374 | /* The symbols `foreground-color' and `background-color' which can be |
| 377 | used as part of a `face' property. This is for compatibility with | 375 | used as part of a `face' property. This is for compatibility with |
| 378 | Emacs 20.2. */ | 376 | Emacs 20.2. */ |
| @@ -6600,12 +6598,6 @@ syms_of_xfaces (void) | |||
| 6600 | defsubr (&Sdump_colors); | 6598 | defsubr (&Sdump_colors); |
| 6601 | #endif | 6599 | #endif |
| 6602 | 6600 | ||
| 6603 | DEFVAR_LISP ("font-list-limit", Vfont_list_limit, | ||
| 6604 | doc: /* Limit for font matching. | ||
| 6605 | If an integer > 0, font matching functions won't load more than | ||
| 6606 | that number of fonts when searching for a matching font. */); | ||
| 6607 | Vfont_list_limit = make_number (DEFAULT_FONT_LIST_LIMIT); | ||
| 6608 | |||
| 6609 | DEFVAR_LISP ("face-new-frame-defaults", Vface_new_frame_defaults, | 6601 | DEFVAR_LISP ("face-new-frame-defaults", Vface_new_frame_defaults, |
| 6610 | doc: /* List of global face definitions (for internal use only.) */); | 6602 | doc: /* List of global face definitions (for internal use only.) */); |
| 6611 | Vface_new_frame_defaults = Qnil; | 6603 | Vface_new_frame_defaults = Qnil; |