diff options
| author | Chong Yidong <cyd@stupidchicken.com> | 2010-10-16 20:00:34 -0400 |
|---|---|---|
| committer | Chong Yidong <cyd@stupidchicken.com> | 2010-10-16 20:00:34 -0400 |
| commit | 29a4c45b988476fe5b926891c5ddf881dd3a5584 (patch) | |
| tree | 2058f492d18907e2969fcd68b6199cca22139445 /lisp/cus-edit.el | |
| parent | 647bc5022ff4fd7ef72d0cb66d9659af252b38df (diff) | |
| download | emacs-29a4c45b988476fe5b926891c5ddf881dd3a5584.tar.gz | |
Allow Custom settings to be migrated into a custom theme.
* cus-theme.el (custom-theme--migrate-settings): New var.
(customize-create-theme): Allow editing the `user' theme.
(custom-theme-add-variable, custom-theme-add-var-1)
(custom-theme-add-face, custom-theme-add-face-1): Add a checkbox
to the front of each variable or face widget.
(custom-theme-write): Save theme settings in the correct order.
Optionally, remove saved settings from user customizations.
(custom-theme-write-variables, custom-theme-write-faces): Saved
only the checked widgets.
(customize-themes): Add a link for migrating custom settings.
* custom.el (custom-declare-theme, provide-theme): Use
custom-theme-name-valid-p.
(custom-theme-name-valid-p): Remove checks that are now
unnecessary since themes no longer obey load-path.
* cus-edit.el (custom-variable-value-create): For the simple
style, hide documentation string when hidden.
Diffstat (limited to 'lisp/cus-edit.el')
| -rw-r--r-- | lisp/cus-edit.el | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/lisp/cus-edit.el b/lisp/cus-edit.el index e0a76b21ff8..61e6881139a 100644 --- a/lisp/cus-edit.el +++ b/lisp/cus-edit.el @@ -2520,6 +2520,7 @@ try matching its doc string against `custom-guess-doc-alist'." (get (or (get symbol 'custom-get) 'default-value)) (prefix (widget-get widget :custom-prefix)) (last (widget-get widget :custom-last)) + (style (widget-get widget :custom-style)) (value (let ((shown-value (widget-get widget :shown-value))) (cond (shown-value (car shown-value)) @@ -2633,7 +2634,7 @@ try matching its doc string against `custom-guess-doc-alist'." (unless (eq (preceding-char) ?\n) (widget-insert "\n")) ;; Create the magic button. - (unless (eq (widget-get widget :custom-style) 'simple) + (unless (eq style 'simple) (let ((magic (widget-create-child-and-convert widget 'custom-magic nil))) (widget-put widget :custom-magic magic) @@ -2641,8 +2642,10 @@ try matching its doc string against `custom-guess-doc-alist'." (widget-put widget :buttons buttons) ;; Insert documentation. (widget-put widget :documentation-indent 3) - (widget-add-documentation-string-button - widget :visibility-widget 'custom-visibility) + (unless (and (eq style 'simple) + (eq state 'hidden)) + (widget-add-documentation-string-button + widget :visibility-widget 'custom-visibility)) ;; The comment field (unless (eq state 'hidden) |