diff options
| author | Chong Yidong <cyd@gnu.org> | 2012-10-23 10:39:13 +0800 |
|---|---|---|
| committer | Chong Yidong <cyd@gnu.org> | 2012-10-23 10:39:13 +0800 |
| commit | 49238e7f5c081b841bdc57d96599c4997dcb487c (patch) | |
| tree | d29f99205bd99e7c6e19f810bd11eeac6ca1fb65 /src | |
| parent | 1fb3aa3fead098e7df1428c7a70e3a32f1da23e4 (diff) | |
| download | emacs-49238e7f5c081b841bdc57d96599c4997dcb487c.tar.gz | |
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 @@ +2012-10-23 Chong Yidong <cyd@gnu.org> + + * xfaces.c (Vfont_list_limit): Move unused variable to faces.el. + 2012-10-21 Jan Djärv <jan.h.d@swipnet.se> * 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; static Lisp_Object Qscalable_fonts_allowed; -#define DEFAULT_FONT_LIST_LIMIT 100 - /* The symbols `foreground-color' and `background-color' which can be used as part of a `face' property. This is for compatibility with Emacs 20.2. */ @@ -6600,12 +6598,6 @@ syms_of_xfaces (void) defsubr (&Sdump_colors); #endif - DEFVAR_LISP ("font-list-limit", Vfont_list_limit, - doc: /* Limit for font matching. -If an integer > 0, font matching functions won't load more than -that number of fonts when searching for a matching font. */); - Vfont_list_limit = make_number (DEFAULT_FONT_LIST_LIMIT); - DEFVAR_LISP ("face-new-frame-defaults", Vface_new_frame_defaults, doc: /* List of global face definitions (for internal use only.) */); Vface_new_frame_defaults = Qnil; |