[Emacs-diffs] Changes to emacs/lisp/facemenu.el

[Richard M . Stallman]

Index: emacs/lisp/facemenu.el
diff -c emacs/lisp/facemenu.el:1.77 emacs/lisp/facemenu.el:1.78
*** emacs/lisp/facemenu.el:1.77 Tue Mar  8 21:47:03 2005
--- emacs/lisp/facemenu.el      Sat Jun 25 22:24:10 2005
***************
*** 162,167 ****
--- 162,168 ----
    "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,176 ****
--- 172,178 ----
    "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,185 ****
--- 182,192 ----
    "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