From: Chong Yidong Date: Tue, 23 Oct 2012 02:39:13 +0000 (+0800) Subject: Make unused variable font-list-limit obsolete, and move it out of C. X-Git-Tag: emacs-24.2.90~211^2~5 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=49238e7f5c081b841bdc57d96599c4997dcb487c;p=emacs.git 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. --- diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog index c18c29d6d63..6bd0297252d 100644 --- a/doc/lispref/ChangeLog +++ b/doc/lispref/ChangeLog @@ -1,5 +1,7 @@ 2012-10-23 Chong Yidong + * display.texi (Font Lookup): Remove font-list-limit. + * keymaps.texi (Key Sequences): Avoid referring to Edit Macro mode (Bug#12529). diff --git a/doc/lispref/display.texi b/doc/lispref/display.texi index 3f92c50e2bc..0b5ada43744 100644 --- a/doc/lispref/display.texi +++ b/doc/lispref/display.texi @@ -2944,14 +2944,6 @@ The last three elements give additional information about the font. encoding of the font. @end defun -@defopt font-list-limit -This variable specifies maximum number of fonts to consider in font -matching. The function @code{x-family-fonts} will not return more -than that many fonts, and font selection will consider only that many -fonts when searching a matching font for face attributes. The default -is 100. -@end defopt - @node Fontsets @subsection Fontsets diff --git a/etc/NEWS b/etc/NEWS index 00d5109aba6..20498bb64da 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -890,6 +890,7 @@ See the "Face Attributes" section of the Elisp manual. *** `window-system-version' *** `dired-pop-to-buffer' (use `dired-mark-pop-up') *** `query-replace-interactive' +*** `font-list-limit' (has had no effect since Emacs < 23) * Changes in Emacs 24.3 on non-free operating systems diff --git a/lisp/ChangeLog b/lisp/ChangeLog index bd40d0f0d30..7670e9c35b6 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,10 @@ 2012-10-23 Chong Yidong + * faces.el (font-list-limit): Define as an obsolete variable. + + * startup.el (command-line): + * cus-start.el: Don't refer to font-list-limit. + * newcomment.el (comment-normalize-vars): Doc fix (Bug#12583). 2012-10-23 Stefan Monnier diff --git a/lisp/cus-start.el b/lisp/cus-start.el index 579551c9a91..2279dc2bf20 100644 --- a/lisp/cus-start.el +++ b/lisp/cus-start.el @@ -487,7 +487,6 @@ since it could result in memory overflow and make Emacs crash." (hourglass-delay cursor number) ;; xfaces.c - (font-list-limit display integer) (scalable-fonts-allowed display boolean "22.1") ;; xfns.c (x-bitmap-file-path installation diff --git a/lisp/faces.el b/lisp/faces.el index 08aa800c067..f5ef88d08b0 100644 --- a/lisp/faces.el +++ b/lisp/faces.el @@ -2572,6 +2572,12 @@ also the same size as FACE on FRAME, or fail." (car fonts)) (cdr (assq 'font (frame-parameters (selected-frame)))))) +(defcustom font-list-limit 100 + "This variable is obsolete and has no effect." + :type 'integer + :group 'display) +(make-obsolete-variable 'font-list-limit nil "24.3") + (provide 'faces) ;;; faces.el ends here diff --git a/lisp/startup.el b/lisp/startup.el index bd75abe5b35..56281a6b164 100644 --- a/lisp/startup.el +++ b/lisp/startup.el @@ -971,7 +971,6 @@ Amongst another things, it parses the command-line arguments." (not (eq 0 (cdr tool-bar-lines))))))) (let ((old-scalable-fonts-allowed scalable-fonts-allowed) - (old-font-list-limit font-list-limit) (old-face-ignored-fonts face-ignored-fonts)) ;; Run the site-start library if it exists. The point of this file is @@ -1162,7 +1161,6 @@ the `--debug-init' option to view a complete error backtrace." ;; face realization, clear the face cache so that new faces will ;; be realized. (unless (and (eq scalable-fonts-allowed old-scalable-fonts-allowed) - (eq font-list-limit old-font-list-limit) (eq face-ignored-fonts old-face-ignored-fonts)) (clear-face-cache))) 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 + + * xfaces.c (Vfont_list_limit): Move unused variable to faces.el. + 2012-10-21 Jan Djärv * 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;