(custom-face-attributes): Add post-filter function for :box.

Make pre-filter function for :box handle all cases.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index dc633c88ab914514bdf45e46603194338671a693..50c1b52c87233fcb0f67292b6b1733da088513aa 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2000-11-28  Miles Bader  <miles@gnu.org>
 
+       * cus-face.el (custom-face-attributes): Add post-filter function
+       for :box.  Make pre-filter function for :box handle all cases.
+
        * wid-edit.el (widget-choose): Make sure pop-up window is large
        enough to display all the choices, as there's no way to scroll it.
 

diff --git a/lisp/cus-face.el b/lisp/cus-face.el
index 7c4930ff990c729ecdabb447b2957df8820cc240..dd6692bc9e83e716c33019e7b667aae6d90ea328 100644 (file)
--- a/lisp/cus-face.el
+++ b/lisp/cus-face.el
@@ -161,8 +161,7 @@
             (const :tag "*" nil)
             (const :tag "Off" off)
             (list :tag "Box"
-                  :value (:line-width 2 :color "grey75"
-                                      :style released-button)
+                  :value (:line-width 2 :color "grey75" :style released-button)
                   (const :format "" :value :line-width)
                   (integer :tag "Width")
                   (const :format "" :value :color)
@@ -174,11 +173,34 @@
                           (const :tag "None" nil))))
      ;; filter to make value suitable for customize
      (lambda (real-value)
-       (if (consp real-value)
-          (list :line-width (or (plist-get real-value :line-width) 1)
-                :color (plist-get real-value :color)
-                :style (plist-get real-value :style))
-        real-value)))
+       (let ((lwidth
+             (or (and (consp real-value) (plist-get real-value :line-width))
+                 (and (integerp real-value) real-value)
+                 1))
+            (color
+             (or (and (consp real-value) (plist-get real-value :color))
+                 (and (stringp real-value) real-value)
+                 nil))
+            (style
+             (and (consp real-value) (plist-get real-value :line-width))))
+        (list :line-width lwidth :color color :style style)))
+     ;; filter to make customized-value suitable for storing
+     (lambda (cus-value)
+       (if (consp cus-value)
+          (let ((lwidth (plist-get cus-value :line-width))
+                (color (plist-get cus-value :color))
+                (style (plist-get cus-value :style)))
+            (cond ((and (null color) (null style))
+                   lwidth)
+                  ((and (null lwidth) (null style))
+                   ;; actually can't happen, because LWIDTH is always an int
+                   color)
+                  (t
+                   ;; Keep as a plist, but remove null entries
+                   (nconc (and lwidth `(:line-width ,lwidth))
+                          (and color  `(:color ,color))
+                          (and style  `(:style ,style))))))
+        cus-value)))
     
     (:inverse-video
      (choice :tag "Inverse-video"