X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/c71a0d48f3c880248a7f7f25e92ddbcbad5ef0e7..267b82ff2374a43cb38617a648c5bfa58ef2b039:/lisp/cus-face.el

diff --git a/lisp/cus-face.el b/lisp/cus-face.el
index 90f21f3214..06fd10149d 100644
--- a/lisp/cus-face.el
+++ b/lisp/cus-face.el
@@ -1,6 +1,6 @@
 ;;; cus-face.el --- customization support for faces
 ;;
-;; Copyright (C) 1996-1997, 1999-2011 Free Software Foundation, Inc.
+;; Copyright (C) 1996-1997, 1999-2012 Free Software Foundation, Inc.
 ;;
 ;; Author: Per Abrahamsen <abraham@dina.kvl.dk>
 ;; Keywords: help, faces
@@ -34,30 +34,33 @@
 (defun custom-declare-face (face spec doc &rest args)
   "Like `defface', but FACE is evaluated as a normal argument."
   (unless (get face 'face-defface-spec)
-    (unless (facep face)
-      ;; If the user has already created the face, respect that.
-      (let ((value (or (get face 'saved-face) spec))
-	    (have-window-system (memq initial-window-system '(x w32))))
-	;; Create global face.
-	(make-empty-face face)
-	;; Create frame-local faces
-	(dolist (frame (frame-list))
-	  (face-spec-set-2 face frame value)
-	  (when (memq (window-system frame) '(x w32 ns))
-	    (setq have-window-system t)))
-	;; When making a face after frames already exist
-	(if have-window-system
-	    (make-face-x-resource-internal face))))
-    ;; Don't record SPEC until we see it causes no errors.
-    (put face 'face-defface-spec (purecopy spec))
-    (push (cons 'defface face) current-load-list)
-    (when (and doc (null (face-documentation face)))
-      (set-face-documentation face (purecopy doc)))
-    (custom-handle-all-keywords face args 'custom-face)
-    (run-hooks 'custom-define-hook)
-    ;; If the face has an existing theme setting, recalculate it.
-    (if (get face 'theme-face)
-	(custom-theme-recalc-face face)))
+    (let ((facep (facep face)))
+      (unless facep
+	;; If the user has already created the face, respect that.
+	(let ((value (or (get face 'saved-face) spec))
+	      (have-window-system (memq initial-window-system '(x w32))))
+	  ;; Create global face.
+	  (make-empty-face face)
+	  ;; Create frame-local faces
+	  (dolist (frame (frame-list))
+	    (face-spec-set-2 face frame value)
+	    (when (memq (window-system frame) '(x w32 ns))
+	      (setq have-window-system t)))
+	  ;; When making a face after frames already exist
+	  (if have-window-system
+	      (make-face-x-resource-internal face))))
+      ;; Don't record SPEC until we see it causes no errors.
+      (put face 'face-defface-spec (purecopy spec))
+      (push (cons 'defface face) current-load-list)
+      (when (and doc (null (face-documentation face)))
+	(set-face-documentation face (purecopy doc)))
+      (custom-handle-all-keywords face args 'custom-face)
+      (run-hooks 'custom-define-hook)
+      ;; If the face had existing settings, recalculate it.  For
+      ;; example, the user might load a theme with a face setting, and
+      ;; later load a library defining that face.
+      (if facep
+	  (custom-theme-recalc-face face))))
   face)
 
 ;;; Face attributes.
@@ -132,8 +135,37 @@
      (choice :tag "Underline"
 	     :help-echo "Control text underlining."
 	     (const :tag "Off" nil)
-	     (const :tag "On" t)
-	     (color :tag "Colored")))
+	     (list :tag "On"
+		   :value (:color foreground-color :style line)
+		   (const :format "" :value :color)
+		   (choice :tag "Color"
+			   (const :tag "Foreground Color" foreground-color)
+			   color)
+		   (const :format "" :value :style)
+		   (choice :tag "Style"
+			   (const :tag "Line" line)
+			   (const :tag "Wave" wave))))
+     ;; filter to make value suitable for customize
+     (lambda (real-value)
+       (and real-value
+	    (let ((color
+		   (or (and (consp real-value) (plist-get real-value :color))
+		       (and (stringp real-value) real-value)
+		       'foreground-color))
+		  (style
+		   (or (and (consp real-value) (plist-get real-value :style))
+		       'line)))
+	      (list :color color :style style))))
+     ;; filter to make customized-value suitable for storing
+     (lambda (cus-value)
+       (and cus-value
+	    (let ((color (plist-get cus-value :color))
+		  (style (plist-get cus-value :style)))
+	      (cond ((eq style 'line)
+		     ;; Use simple value for default style
+		     (if (eq color 'foreground-color) t color))
+		    (t
+		     `(:color ,color :style ,style)))))))
 
     (:overline
      (choice :tag "Overline"