[Emacs-diffs] Changes to emacs/lisp/cus-edit.el

[Chong Yidong]

Index: emacs/lisp/cus-edit.el
diff -u emacs/lisp/cus-edit.el:1.288 emacs/lisp/cus-edit.el:1.289
--- emacs/lisp/cus-edit.el:1.288        Fri Mar 17 23:12:14 2006
+++ emacs/lisp/cus-edit.el      Tue Mar 21 16:44:10 2006
@@ -3412,12 +3412,12 @@
       ;; Make the comment invisible by hand if it's empty
       (custom-comment-hide comment-widget))
     (put symbol 'customized-face value)
+    (custom-push-theme 'theme-face symbol 'user 'set value)
     (if (face-spec-choose value)
        (face-spec-set symbol value)
       ;; face-set-spec ignores empty attribute lists, so just give it
       ;; something harmless instead.
       (face-spec-set symbol '((t :foreground unspecified))))
-    (custom-push-theme 'theme-face symbol 'user 'set value)
     (put symbol 'customized-face-comment comment)
     (put symbol 'face-comment comment)
     (custom-face-state-set widget)
@@ -3490,13 +3490,17 @@
     (put symbol 'customized-face nil)
     (put symbol 'customized-face-comment nil)
     (custom-push-theme 'theme-face symbol 'user 'reset)
+    (face-spec-set symbol value)
     (custom-theme-recalc-face symbol)
     (when (or (get symbol 'saved-face) (get symbol 'saved-face-comment))
       (put symbol 'saved-face nil)
       (put symbol 'saved-face-comment nil)
       (custom-save-all))
     (put symbol 'face-comment nil)
-    (widget-value-set child value)
+    (widget-value-set child
+                     (custom-pre-filter-face-spec
+                      (list (list t (custom-face-attributes-get
+                                     symbol nil)))))
     ;; This call manages the comment visibility
     (widget-value-set comment-widget "")
     (custom-face-state-set widget)