# HG changeset patch # User Richard M. Stallman # Date 1119738250 0 # Node ID cae70b5066ae88b51dadf2dbb70e2f65b8cd1879 # Parent 79a2185587dcd8005a0e4900444e56794ec4d99b (facemenu-enable-faces-p): New function. (facemenu-background-menu, facemenu-foreground-menu) (facemenu-face-menu): Add menu-enable property. diff -r 79a2185587dc -r cae70b5066ae lisp/facemenu.el --- a/lisp/facemenu.el Sat Jun 25 14:38:05 2005 +0000 +++ b/lisp/facemenu.el Sat Jun 25 22:24:10 2005 +0000 @@ -162,6 +162,7 @@ "Menu keymap for faces.") ;;;###autoload (defalias 'facemenu-face-menu facemenu-face-menu) +(put 'facemenu-face-menu 'menu-enable '(facemenu-enable-faces-p)) ;;;###autoload (defvar facemenu-foreground-menu @@ -171,6 +172,7 @@ "Menu keymap for foreground colors.") ;;;###autoload (defalias 'facemenu-foreground-menu facemenu-foreground-menu) +(put 'facemenu-foreground-menu 'menu-enable '(facemenu-enable-faces-p)) ;;;###autoload (defvar facemenu-background-menu @@ -180,6 +182,11 @@ "Menu keymap for background colors.") ;;;###autoload (defalias 'facemenu-background-menu facemenu-background-menu) +(put 'facemenu-background-menu 'menu-enable '(facemenu-enable-faces-p)) + +;;; Condition for enabling menu items that set faces. +(defun facemenu-enable-faces-p () + (not (and font-lock-mode font-lock-defaults))) ;;;###autoload (defvar facemenu-special-menu