diff lisp/x-font-menu.el @ 359:8e84bee8ddd0 r21-1-9

Import from CVS: tag r21-1-9
author cvs
date Mon, 13 Aug 2007 10:57:55 +0200
parents 8bec6624d99b
children cc15677e0335
line wrap: on
line diff
--- a/lisp/x-font-menu.el	Mon Aug 13 10:57:07 2007 +0200
+++ b/lisp/x-font-menu.el	Mon Aug 13 10:57:55 2007 +0200
@@ -445,15 +445,10 @@
 	  ;; The user can no longer easily control the weight using the menu
 	  ;; Note it is silly anyway as it could very well be that the font
 	  ;; has no common size+weight combinations with the default font.
-;;	  (if (and (member weight (aref entry 1))
-;;		   (or (member size (aref entry 2))
-;;		       (and (not font-menu-ignore-scaled-fonts)
-;;			    (member 0 (aref entry 2)))))
-;;	      (enable-menu-item item)
-;;	    (disable-menu-item item))
-	  (if (and font-menu-ignore-scaled-fonts (member 0 (aref entry 2)))
+	  (if (and (not (member size (aref entry 2)))
+		   font-menu-ignore-scaled-fonts (member 0 (aref entry 2)))
 	      (disable-menu-item item)
-	    (enable-menu-item item))	  
+	    (enable-menu-item item))  
 	  (if (string-equal family f)
 	      (select-toggle-menu-item item)
 	    (deselect-toggle-menu-item item))