[Emacs-diffs] /srv/bzr/emacs/trunk r110625: Make unused variable font-list-limit obsolete, and move it out of C.

[Chong Yidong]

------------------------------------------------------------
revno: 110625
committer: Chong Yidong <address@hidden>
branch nick: trunk
timestamp: Tue 2012-10-23 10:39:13 +0800
message:
  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.
modified:
  doc/lispref/ChangeLog
  doc/lispref/display.texi
  etc/NEWS
  lisp/ChangeLog
  lisp/cus-start.el
  lisp/faces.el
  lisp/startup.el
  src/ChangeLog
  src/xfaces.c

=== modified file 'doc/lispref/ChangeLog'
--- a/doc/lispref/ChangeLog     2012-10-23 02:23:39 +0000
+++ b/doc/lispref/ChangeLog     2012-10-23 02:39:13 +0000
@@ -1,5 +1,7 @@
 2012-10-23  Chong Yidong  <address@hidden>
 
+       * display.texi (Font Lookup): Remove font-list-limit.
+
        * keymaps.texi (Key Sequences): Avoid referring to Edit Macro mode
        (Bug#12529).
 

=== modified file 'doc/lispref/display.texi'
--- a/doc/lispref/display.texi  2012-10-13 01:18:52 +0000
+++ b/doc/lispref/display.texi  2012-10-23 02:39:13 +0000
@@ -2944,14 +2944,6 @@
 encoding of the font.
 @end defun
 
address@hidden 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.
address@hidden defopt
-
 @node Fontsets
 @subsection Fontsets
 

=== modified file 'etc/NEWS'
--- a/etc/NEWS  2012-10-15 21:00:19 +0000
+++ b/etc/NEWS  2012-10-23 02:39:13 +0000
@@ -890,6 +890,7 @@
 *** `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

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-10-23 02:17:36 +0000
+++ b/lisp/ChangeLog    2012-10-23 02:39:13 +0000
@@ -1,5 +1,10 @@
 2012-10-23  Chong Yidong  <address@hidden>
 
+       * 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  <address@hidden>

=== modified file 'lisp/cus-start.el'
--- a/lisp/cus-start.el 2012-10-08 07:18:02 +0000
+++ b/lisp/cus-start.el 2012-10-23 02:39:13 +0000
@@ -487,7 +487,6 @@
             (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

=== modified file 'lisp/faces.el'
--- a/lisp/faces.el     2012-10-07 22:31:58 +0000
+++ b/lisp/faces.el     2012-10-23 02:39:13 +0000
@@ -2572,6 +2572,12 @@
        (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

=== modified file 'lisp/startup.el'
--- a/lisp/startup.el   2012-10-07 22:31:58 +0000
+++ b/lisp/startup.el   2012-10-23 02:39:13 +0000
@@ -971,7 +971,6 @@
                  (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 @@
     ;; 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)))
 

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2012-10-21 18:48:11 +0000
+++ b/src/ChangeLog     2012-10-23 02:39:13 +0000
@@ -1,3 +1,7 @@
+2012-10-23  Chong Yidong  <address@hidden>
+
+       * xfaces.c (Vfont_list_limit): Move unused variable to faces.el.
+
 2012-10-21  Jan Djärv  <address@hidden>
 
        * nsfont.m (nsfont_open, ns_glyph_metrics): Force integer advancement

=== modified file 'src/xfaces.c'
--- a/src/xfaces.c      2012-10-20 21:30:51 +0000
+++ b/src/xfaces.c      2012-10-23 02:39:13 +0000
@@ -371,8 +371,6 @@
 
 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 @@
   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;