Mercurial > hg > xemacs-beta

diff lisp/x-font-menu.el @ 3659:98af8a976fc3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[xemacs-hg @ 2006-11-05 22:31:31 by aidan] Support specifying fonts for particular character sets in Mule; support translation to ISO 10646-1 for Mule character sets without an otherwise matching font; move to a vector of X11-charset-X11-registry instead of a regex for the charset-registry property.
author aidan
date Sun, 05 Nov 2006 22:31:46 +0000
parents d8309294c81c
children b8ded6c3f2a4
line wrap: on
line diff
--- a/lisp/x-font-menu.el	Sat Nov 04 22:51:03 2006 +0000
+++ b/lisp/x-font-menu.el	Sun Nov 05 22:31:46 2006 +0000
@@ -43,7 +43,7 @@
    x-font-regexp-spacing))
 
 (globally-declare-fboundp
- '(charset-registry))
+ '(charset-registries))
 
 (defvar x-font-menu-registry-encoding nil
   "Registry and encoding to use with font menu fonts.")
@@ -157,9 +157,7 @@
   ;; #### - this should implement a `menus-only' option, which would
   ;; recalculate the menus from the cache w/o having to do font-list again.
   (unless x-font-regexp-ascii
-    (setq x-font-regexp-ascii (if (featurep 'mule)
-				  (charset-registry 'ascii)
-				"iso8859-1")))
+    (setq x-font-regexp-ascii (elt (charset-registries 'ascii) 0)))
   (setq x-font-menu-registry-encoding
 	(if (featurep 'mule) "*-*" "iso8859-1"))
   (let ((case-fold-search t)