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 c18c29d6d631f3d7d4715f67525d5386295cf42e..6bd0297252dbce273b75a66dafd788b2d16af7e7 100644 (file)
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,5 +1,7 @@
 2012-10-23  Chong Yidong  <cyd@gnu.org>
 
+       * 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 3f92c50e2bcbd67799f8bc513ed110c288dd93de..0b5ada4374400fafc3da09dfbea03c05f60bff27 100644 (file)
--- 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 00d5109aba6274ced3b575d685392ca555dc8445..20498bb64da0f6b75cdae048a5391e762d1c7bb4 100644 (file)
--- 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)
 
 \f
 * Changes in Emacs 24.3 on non-free operating systems

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index bd40d0f0d305b7c9a872268175d0d18471fac00b..7670e9c35b601762b7c8ecea556aaa555b8c80e3 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,10 @@
 2012-10-23  Chong Yidong  <cyd@gnu.org>
 
+       * 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  <monnier@iro.umontreal.ca>

diff --git a/lisp/cus-start.el b/lisp/cus-start.el
index 579551c9a914ad2b8a171fc34b3c9e01995e8288..2279dc2bf203215ed88f578cd9bac1e4a435349f 100644 (file)
--- 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 08aa800c0675ee79019a952c7f9acddf15a8bc23..f5ef88d08b02375ba0c59eba0d426a7fb4ed6724 100644 (file)
--- 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 bd75abe5b35ebb88c80bddfaee859b6776e7fd24..56281a6b1647f2c22364d60cec6dc3134de35078 100644 (file)
--- 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 6fe7de51293a06e6aafe3cba47ab09157cb2c526..644cbc47bfec4477783015e5562184a3931e76c0 100644 (file)
--- 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 eb9d2dc9f0489644494c92f688c2a2e098beee8d..221387c4b6d1bc73b590ccc76529578ea42418a6 100644 (file)
--- 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;