X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Fx-font-menu.el;h=b4adead123d415fd5ffaebc2863ccb894a1405f9;hb=6e19fc71f6c7c22ecc2b1230aed517ad7f756739;hp=8dffa3991bffa2746fe84f581c645b77ef1e6ba3;hpb=113b194be934327de99a168d809271db252c07c4;p=chise%2Fxemacs-chise.git.1

diff --git a/lisp/x-font-menu.el b/lisp/x-font-menu.el
index 8dffa39..b4adead 100644
--- a/lisp/x-font-menu.el
+++ b/lisp/x-font-menu.el
@@ -4,7 +4,7 @@
 ;; Copyright (C) 1995 Tinker Systems and INS Engineering Corp.
 ;; Copyright (C) 1997 Sun Microsystems
 
-;; Author: Jamie Zawinski <jwz@netscape.com>
+;; Author: Jamie Zawinski <jwz@jwz.org>
 ;; Restructured by: Jonathan Stigelman <Stig@hackvan.com>
 ;; Mule-ized by: Martin Buchholz
 ;; More restructuring for MS-Windows by Andy Piper <andy@xemacs.org>
@@ -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)