Allow hiding of modified custom widgets.

* cus-edit.el (custom-variable, custom-face): Combine the
:inhibit-magic and :display-style properties into a single
:custom-style property.
(custom-toggle-hide-variable, custom-toggle-hide-face): New
functions.  If hiding an edited value, save it to :shown-value.
(custom-variable-value-create, custom-face-value-create): Use
them.
(custom-magic-reset): Allow magic property to be unset.

* cus-theme.el (custom-theme-add-var-1)
(custom-theme-add-face-1): Use the :custom-style property.

* custom.el: (custom-theme-load-path): Doc fix.

1 files changed, 4 insertions, 5 deletions

diff --git a/lisp/cus-theme.el b/lisp/cus-theme.el
index 34a03539719..4295fa75206 100644
--- a/lisp/cus-theme.el
+++ b/lisp/cus-theme.el
@@ -41,7 +41,7 @@
     map)
   "Keymap for `custom-new-theme-mode'.")
 
-(define-derived-mode custom-new-theme-mode nil "Cus-Theme"
+(define-derived-mode custom-new-theme-mode nil "Custom-Theme"
   "Major mode for editing Custom themes.
 Do not call this mode function yourself.  It is meant for internal use."
   (use-local-map custom-new-theme-mode-map)
@@ -214,7 +214,7 @@ interactively, this defaults to the current value of VAR."
                              :notify 'ignore
                              :custom-level 0
                              :custom-state 'hidden
-                             :inhibit-magic t))
+                             :custom-style 'simple))
         custom-theme-variables)
   (widget-insert " "))
 
@@ -250,9 +250,8 @@ SPEC, if non-nil, should be a face spec to which to set the widget."
                              :documentation-shown t
                              :value symbol
                              :custom-state 'hidden
-                             :display-style 'concise
+                             :custom-style 'simple
                              :shown-value spec
-                             :inhibit-magic t
                              :sample-indent 34))
         custom-theme-faces)
   (widget-insert " "))
@@ -476,7 +475,7 @@ It includes all faces in list FACES."
     map)
   "Keymap for `custom-theme-choose-mode'.")
 
-(define-derived-mode custom-theme-choose-mode nil "Cus-Theme"
+(define-derived-mode custom-theme-choose-mode nil "Themes"
   "Major mode for selecting Custom themes.
 Do not call this mode function yourself.  It is meant for internal use."
   (use-local-map custom-theme-choose-mode-map)