# HG changeset patch
# User Juri Linkov <juri@jurta.org>
# Date 1134546421 0
# Node ID fdc28fc82a271a029a41fb200d8c307c14e603f8
# Parent  890887cd17a8f435f009c9f3fdd3bc6b80a2ad88
(cpp-face): New widget.
(cpp-known-face, cpp-unknown-face, cpp-edit-list): Use it.

diff -r 890887cd17a8 -r fdc28fc82a27 lisp/progmodes/cpp.el
--- a/lisp/progmodes/cpp.el	Wed Dec 14 07:46:11 2005 +0000
+++ b/lisp/progmodes/cpp.el	Wed Dec 14 07:47:01 2005 +0000
@@ -59,14 +59,18 @@
   :type 'file
   :group 'cpp)
 
+(define-widget 'cpp-face 'lazy
+  "Either a face or the special symbol 'invisible'."
+  :type '(choice (const invisible) (face)))
+
 (defcustom cpp-known-face 'invisible
   "*Face used for known cpp symbols."
-  :type 'face
+  :type 'cpp-face
   :group 'cpp)
 
 (defcustom cpp-unknown-face 'highlight
   "*Face used for unknown cpp symbols."
-  :type 'face
+  :type 'cpp-face
   :group 'cpp)
 
 (defcustom cpp-face-type 'light
@@ -95,10 +99,12 @@
 1. Face used for text that is `ifdef' the macro.
 2. Face used for text that is `ifndef' the macro.
 3. t, nil, or `both' depending on what text may be edited."
-  :type '(repeat (list string face face
-		       (choice (const t)
-			       (const nil)
-			       (const both))))
+  :type '(repeat (list (string :tag "Macro")
+		       (cpp-face :tag "True")
+		       (cpp-face :tag "False")
+		       (choice (const :tag "True branch writable" t)
+			       (const :tag "False branch writeable" nil)
+			       (const :tag "Both branches writeable" both))))
   :group 'cpp)
 
 (defvar cpp-overlay-list nil)