# HG changeset patch
# User aidan
# Date 1177233852 0
# Node ID b8ded6c3f2a40549530c30c7aac4960d66310277
# Parent  c3650461398a81b9397e7e47fc8a2a1f86f81072
[xemacs-hg @ 2007-04-22 09:24:11 by aidan]
Only call charset-registries in the font menu if it's available.

diff -r c3650461398a -r b8ded6c3f2a4 lisp/ChangeLog
--- a/lisp/ChangeLog	Sat Apr 21 21:52:15 2007 +0000
+++ b/lisp/ChangeLog	Sun Apr 22 09:24:12 2007 +0000
@@ -1,3 +1,9 @@
+2007-04-22  Aidan Kehoe  <kehoea@parhasard.net>
+
+	* x-font-menu.el (x-reset-device-font-menus-core):
+	Only call charset-registries in the font menu if it's
+	available. Restores font menu functionality on non-Mule. 
+	
 2007-03-29  Stephen J. Turnbull  <stephen@xemacs.org>
 
 	* diagnose.el (show-object-memory-usage-stats): Fix docstring typo.
diff -r c3650461398a -r b8ded6c3f2a4 lisp/x-font-menu.el
--- a/lisp/x-font-menu.el	Sat Apr 21 21:52:15 2007 +0000
+++ b/lisp/x-font-menu.el	Sun Apr 22 09:24:12 2007 +0000
@@ -157,7 +157,10 @@
   ;; #### - 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 (elt (charset-registries 'ascii) 0)))
+    (setq x-font-regexp-ascii 
+          (if (fboundp 'charset-registries) 
+              (elt (charset-registries 'ascii) 0)
+            "iso8859-1")))
   (setq x-font-menu-registry-encoding
 	(if (featurep 'mule) "*-*" "iso8859-1"))
   (let ((case-fold-search t)