From: Richard M. Stallman <rms@gnu.org>
Date: Tue, 28 Jun 2005 18:55:48 +0000 (+0000)
Subject: (facemenu-add-face): Warn when font-lock is active.
X-Git-Tag: emacs-pretest-22.0.90~8603
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=97a7aa7b36786f4edcd3452f6665d3792636452b;p=emacs.git

(facemenu-add-face): Warn when font-lock is active.
---

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'."
 						  self-insert-face
 						(list self-insert-face)))
 				 face)
-	      self-insert-face-command this-command)))))
+	      self-insert-face-command this-command))))
+  (unless (facemenu-enable-faces-p)
+    (message "Font-lock mode will override any faces you set in this buffer")))
 
 (defun facemenu-active-faces (face-list &optional frame)
   "Return from FACE-LIST those faces that would be used for display.