diff options
| author | Chong Yidong <cyd@stupidchicken.com> | 2009-10-31 21:52:53 +0000 |
|---|---|---|
| committer | Chong Yidong <cyd@stupidchicken.com> | 2009-10-31 21:52:53 +0000 |
| commit | 673c1168a07b3c26b0d7e01e049f7226fcc91b00 (patch) | |
| tree | e2b613ac98f710f9ec55d09d937d6470a23d39d6 /lisp/facemenu.el | |
| parent | c9349f0a05aa95d3ce4d406387e479a99cd0a4bb (diff) | |
| download | emacs-673c1168a07b3c26b0d7e01e049f7226fcc91b00.tar.gz | |
* textmodes/sgml-mode.el (sgml-mode-facemenu-add-face-function):
Support face colors.
* textmodes/tex-mode.el (tex-facemenu-add-face-function): New
function. Support face colors (Bug#1168).
(tex-common-initialization): Use it.
* facemenu.el (facemenu-enable-faces-p): Enable facemenu if the
mode allows it (Bug#1168).
Diffstat (limited to 'lisp/facemenu.el')
| -rw-r--r-- | lisp/facemenu.el | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/lisp/facemenu.el b/lisp/facemenu.el index aedb6d355b6..389fbf804e0 100644 --- a/lisp/facemenu.el +++ b/lisp/facemenu.el @@ -187,7 +187,10 @@ it will remove any faces not explicitly in the list." ;;; Condition for enabling menu items that set faces. (defun facemenu-enable-faces-p () - (not (and font-lock-mode font-lock-defaults))) + ;; Enable the facemenu if facemenu-add-face-function is defined + ;; (e.g. in Tex-mode and SGML mode), or if font-lock is off. + (or (not (and font-lock-mode font-lock-defaults)) + facemenu-add-face-function)) (defvar facemenu-special-menu (let ((map (make-sparse-keymap "Special"))) |