update.

[chise/xemacs-chise.git.1] / lisp / x-font-menu.el

diff --git a/lisp/x-font-menu.el b/lisp/x-font-menu.el
index 54f4c66..b4adead 100644 (file)
--- a/lisp/x-font-menu.el
+++ b/lisp/x-font-menu.el
@@ -38,17 +38,16 @@
   "Registry and encoding to use with font menu fonts.")
 
 (defvar x-fonts-menu-junk-families
-  (purecopy
-   (mapconcat
-    #'identity
-    '("cursor" "glyph" "symbol"        ; Obvious losers.
-      "\\`Ax...\\'"            ; FrameMaker fonts - there are just way too
+  (mapconcat
+   #'identity
+   '("cursor" "glyph" "symbol" ; Obvious losers.
+     "\\`Ax...\\'"             ; FrameMaker fonts - there are just way too
                                ;  many of these, and there is a different
                                ;  font family for each font face!  Losers.
                                ;  "Axcor" -> "Applix Courier Roman",
                                ;  "Axcob" -> "Applix Courier Bold", etc.
-      )
-    "\\|"))
+     )
+   "\\|")
   "A regexp matching font families which are uninteresting (e.g. cursor fonts).")
 
 (defun hack-font-truename (fn)
@@ -185,6 +184,8 @@ or if you change your font path, you can call this to re-initialize the menus."
 ;; get the truename and use the possibly suboptimal data from that.
 ;;;###autoload
 (defun* x-font-menu-font-data (face dcache)
+  (defvar x-font-regexp)
+  (defvar x-font-regexp-foundry-and-family)
   (let* ((case-fold-search t)
         (domain (if font-menu-this-frame-only-p
                                  (selected-frame)