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

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

(facemenu-enable-faces-p): New function.
(facemenu-background-menu, facemenu-foreground-menu) (facemenu-face-menu): Add menu-enable property.
6c763f36 · Richard M. Stallman · df13531d · 6c763f36
Commit 6c763f36 authored Jun 25, 2005 by Richard M. Stallman
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 0 deletions

lisp/facemenu.el lisp/facemenu.el +7 -0

No files found.
--- 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