Commit 49238e7f authored by Chong Yidong's avatar Chong Yidong
Browse files

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.
parent 1fb3aa3f
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).
......
......@@ -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
......
......@@ -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
......
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>
......
......@@ -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
......
......@@ -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
......@@ -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)))
......
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
......
......@@ -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;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment