diff options
| author | Richard M. Stallman | 2005-06-28 18:55:48 +0000 |
|---|---|---|
| committer | Richard M. Stallman | 2005-06-28 18:55:48 +0000 |
| commit | 97a7aa7b36786f4edcd3452f6665d3792636452b (patch) | |
| tree | ac7bbb1b90f82e21b777480de2cd73a2df3ede76 | |
| parent | f2e0a47d249b47e291619db341f11ae8d8d1e8f6 (diff) | |
| download | emacs-97a7aa7b36786f4edcd3452f6665d3792636452b.tar.gz emacs-97a7aa7b36786f4edcd3452f6665d3792636452b.zip | |
(facemenu-add-face): Warn when font-lock is active.
| -rw-r--r-- | lisp/facemenu.el | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lisp/facemenu.el b/lisp/facemenu.el index 18023511c20..43c275e4a2f 100644 --- a/lisp/facemenu.el +++ b/lisp/facemenu.el | |||
| @@ -611,7 +611,9 @@ effect. See `facemenu-remove-face-function'." | |||
| 611 | self-insert-face | 611 | self-insert-face |
| 612 | (list self-insert-face))) | 612 | (list self-insert-face))) |
| 613 | face) | 613 | face) |
| 614 | self-insert-face-command this-command))))) | 614 | self-insert-face-command this-command)))) |
| 615 | (unless (facemenu-enable-faces-p) | ||
| 616 | (message "Font-lock mode will override any faces you set in this buffer"))) | ||
| 615 | 617 | ||
| 616 | (defun facemenu-active-faces (face-list &optional frame) | 618 | (defun facemenu-active-faces (face-list &optional frame) |
| 617 | "Return from FACE-LIST those faces that would be used for display. | 619 | "Return from FACE-LIST those faces that would be used for display. |