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 /lisp | |
| 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 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/cus-start.el | 1 | ||||
| -rw-r--r-- | lisp/faces.el | 6 | ||||
| -rw-r--r-- | lisp/startup.el | 2 |
4 files changed, 11 insertions, 3 deletions
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 <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 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))) |