summaryrefslogtreecommitdiff
path: root/lisp/progmodes/cpp.el
diff options
context:
space:
mode:
Diffstat (limited to 'lisp/progmodes/cpp.el')
-rw-r--r--lisp/progmodes/cpp.el7
1 files changed, 6 insertions, 1 deletions
diff --git a/lisp/progmodes/cpp.el b/lisp/progmodes/cpp.el
index 674d98b8dc3..d332d8bff31 100644
--- a/lisp/progmodes/cpp.el
+++ b/lisp/progmodes/cpp.el
@@ -136,13 +136,18 @@ Each entry is a list with the following elements:
("true" . t)
("both" . both)))
+;; FIXME Gets clobbered by cpp-choose-face, so why is even it a defcustom?
(defcustom cpp-face-default-list nil
"Alist of faces you can choose from for cpp conditionals.
Each element has the form (STRING . FACE), where STRING
serves as a name (for `cpp-highlight-buffer' only)
and FACE is either a face (a symbol)
or a cons cell (background-color . COLOR)."
- :type '(repeat (cons string (choice face (cons (const background-color) string))))
+ :type '(alist :key-type (string :tag "Name")
+ :value-type (choice face
+ (const invisible)
+ (cons (const background-color)
+ (string :tag "Color"))))
:group 'cpp)
(defcustom cpp-face-light-name-list