[COMMIT] Only call charset-registries in the font menu if it's available

Aidan Kehoe kehoea at parhasard.net
Sun Apr 22 05:24:29 EDT 2007


APPROVE COMMIT

NOTE: This patch has been committed.

lisp/ChangeLog addition:

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. 
	

XEmacs Trunk source patch:
Diff command:   cvs -q diff -Nu
Files affected: lisp/x-font-menu.el
===================================================================
RCS

Index: lisp/x-font-menu.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/x-font-menu.el,v
retrieving revision 1.18
diff -u -u -r1.18 x-font-menu.el
--- lisp/x-font-menu.el	2006/11/05 22:31:32	1.18
+++ lisp/x-font-menu.el	2007/04/22 09:23:05
@@ -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)

-- 
On the quay of the little Black Sea port, where the rescued pair came once
more into contact with civilization, Dobrinton was bitten by a dog which was
assumed to be mad, though it may only have been indiscriminating. (Saki)



More information about the XEmacs-Patches mailing list