(facemenu-enable-faces-p): New function.

(facemenu-background-menu, facemenu-foreground-menu)
(facemenu-face-menu): Add menu-enable property.

diff --git a/lisp/facemenu.el b/lisp/facemenu.el
index cd3998520a145910151322dfc0eff51ac75b9798..57dea40266a9443159c2d1438306767eef2d9d5d 100644 (file)
--- a/lisp/facemenu.el
+++ b/lisp/facemenu.el
@@ -162,6 +162,7 @@ when they are created."
   "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 @@ when they are created."
   "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 @@ when they are created."
   "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