Mercurial > hg > xemacs-beta

diff lisp/gtk-font-menu.el @ 4103:b4f4e0cc90f1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[xemacs-hg @ 2007-08-07 23:08:47 by aidan] Eliminate byte compiler warnings, give nicer errors in the absence of packages.
author aidan
date Tue, 07 Aug 2007 23:09:22 +0000
parents 491f8cf78a9c
children 2a54dfbe434f 308d34e9f07d
line wrap: on
line diff
--- a/lisp/gtk-font-menu.el	Tue Aug 07 21:51:12 2007 +0000
+++ b/lisp/gtk-font-menu.el	Tue Aug 07 23:09:22 2007 +0000
@@ -92,10 +92,9 @@
   ;; #### - this should implement a `menus-only' option, which would
   ;; recalculate the menus from the cache w/o having to do font-list again.
   (unless gtk-font-regexp-ascii
-    (setq gtk-font-regexp-ascii (if (featurep 'mule)
-				    (declare-fboundp
-				     (charset-registry 'ascii))
-				  "iso8859-1")))
+    (setq gtk-font-regexp-ascii (if-fboundp #'charset-registries
+                                    (aref (charset-registries 'ascii) 0)
+                                  "iso8859-1")))
   (setq gtk-font-menu-registry-encoding
 	(if (featurep 'mule) "*-*" "iso8859-1"))
   (let ((case-fold-search t)