aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard M. Stallman2005-12-25 18:59:47 +0000
committerRichard M. Stallman2005-12-25 18:59:47 +0000
commit6728475c5ca2f1adc48e9800cbb991f0608c51eb (patch)
treee251a55a17bc6d8c9931249cf78f794874f62421
parent180a4473763d5181502b287c7ec492e5fb3a3244 (diff)
downloademacs-6728475c5ca2f1adc48e9800cbb991f0608c51eb.tar.gz
emacs-6728475c5ca2f1adc48e9800cbb991f0608c51eb.zip
(cpp-face-none-list): Use cpp-face instead of face.
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/progmodes/cpp.el2
2 files changed, 5 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 91cc1de5b7f..cb97e1decd2 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
12005-12-25 Richard M. Stallman <rms@gnu.org>
2
3 * progmodes/cpp.el (cpp-face-none-list): Use cpp-face instead of face.
4
12005-12-25 Romain Francoise <romain@orebokech.com> 52005-12-25 Romain Francoise <romain@orebokech.com>
2 6
3 * battery.el (battery-linux-proc-acpi): Also try 7 * battery.el (battery-linux-proc-acpi): Also try
diff --git a/lisp/progmodes/cpp.el b/lisp/progmodes/cpp.el
index 7e0bb8b4f9b..cf119bde719 100644
--- a/lisp/progmodes/cpp.el
+++ b/lisp/progmodes/cpp.el
@@ -189,7 +189,7 @@ or a cons cell (background-color . COLOR)."
189 '(("default" . default) 189 '(("default" . default)
190 ("invisible" . invisible)) 190 ("invisible" . invisible))
191 "Alist of names and faces available even if you don't use a window system." 191 "Alist of names and faces available even if you don't use a window system."
192 :type '(repeat (cons string face)) 192 :type '(repeat (cons string cpp-face))
193 :group 'cpp) 193 :group 'cpp)
194 194
195(defvar cpp-face-all-list 195(defvar cpp-face-all-list