CVS update by aidan xemacs/lisp ...

[xemacs-cvs at xemacs.org]

  User: aidan   
  Date: 07/04/22 11:24:14

  Modified:    xemacs/lisp ChangeLog x-font-menu.el
Log:
Only call charset-registries in the font menu if it's available.

Revision  Changes    Path
1.789     +6 -0      XEmacs/xemacs/lisp/ChangeLog

Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/ChangeLog,v
retrieving revision 1.788
retrieving revision 1.789
diff -u -p -r1.788 -r1.789
--- ChangeLog	2007/03/30 14:38:39	1.788
+++ ChangeLog	2007/04/22 09:24:11	1.789
@@ -1,3 +1,9 @@
+2007-04-22  Aidan Kehoe  <kehoea at 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 at xemacs.org>
 
 	* diagnose.el (show-object-memory-usage-stats): Fix docstring typo.



1.19      +4 -1      XEmacs/xemacs/lisp/x-font-menu.el

Index: x-font-menu.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/x-font-menu.el,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- x-font-menu.el	2006/11/05 22:31:32	1.18
+++ x-font-menu.el	2007/04/22 09:24:12	1.19
@@ -157,7 +157,10 @@ or if you change your font path, you can
   ;; #### - 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)