From: Kenichi Handa <handa@m17n.org>
Date: Fri, 27 Sep 2002 04:54:02 +0000 (+0000)
Subject: (generate-fontset-menu): Exclude the defualt fontset.
X-Git-Tag: emacs-pretest-23.0.90~8295^2~1864^2~323
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=d58b6a31c698e7ac64974980139ff68cf1114e64;p=emacs.git

(generate-fontset-menu): Exclude the defualt fontset.
---

diff --git a/lisp/international/fontset.el b/lisp/international/fontset.el
index 31bc0e223e5..e323d37d412 100644
--- a/lisp/international/fontset.el
+++ b/lisp/international/fontset.el
@@ -427,14 +427,12 @@ with \"fontset\" in `<CHARSET_REGISTRY> field."
 ;; Return a list to be appended to `x-fixed-font-alist' when
 ;; `mouse-set-font' is called.
 (defun generate-fontset-menu ()
-  (let ((fontsets (fontset-list))
-	fontset-name
-	l)
-    (while fontsets
-      (setq fontset-name (car fontsets) fontsets (cdr fontsets))
-      (setq l (cons (list (fontset-plain-name fontset-name) fontset-name) l)))
+  (let (l)
+    (dolist (fontset (fontset-list))
+      (or (string-match "fontset-default$" fontset)
+	  (push (list (fontset-plain-name fontset) fontset) l)))
     (cons "Fontset"
-	  (sort l (function (lambda (x y) (string< (car x) (car y))))))))
+	  (sort l #'(lambda (x y) (string< (car x) (car y)))))))
 
 (defun fontset-plain-name (fontset)
   "Return a plain and descriptive name of FONTSET."