summaryrefslogtreecommitdiff
path: root/lisp/custom.el
diff options
context:
space:
mode:
authorChong Yidong <cyd@stupidchicken.com>2010-10-16 16:36:20 -0400
committerChong Yidong <cyd@stupidchicken.com>2010-10-16 16:36:20 -0400
commit647bc5022ff4fd7ef72d0cb66d9659af252b38df (patch)
treefce772973ca243b41b38393664a24b4ca6bd978b /lisp/custom.el
parent782b5e8d92668cc6d434c836d076e26db1cab7c1 (diff)
downloademacs-647bc5022ff4fd7ef72d0cb66d9659af252b38df.tar.gz
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.
Diffstat (limited to 'lisp/custom.el')
-rw-r--r--lisp/custom.el9
1 files changed, 5 insertions, 4 deletions
diff --git a/lisp/custom.el b/lisp/custom.el
index 8ece438065f..738b9c6bc8d 100644
--- a/lisp/custom.el
+++ b/lisp/custom.el
@@ -1066,10 +1066,11 @@ directory first---see `custom-theme-load-path'."
Emacs commands for loading custom themes (e.g. `customize-themes'
and `load-theme') search for custom theme files in the specified
order. Each element in the list should be one of the following:
-\(i) the symbol `custom-theme-directory', which means the value
-of that variable; (ii) the symbol t (the built-in Emacs theme
-directory, named \"themes\" in `data-directory'); or \(iii) a
-directory name (a string)."
+- the symbol `custom-theme-directory', meaning the value of
+ `custom-theme-directory'.
+- the symbol t, meaning the built-in theme directory (a directory
+ named \"themes\" in `data-directory').
+- a directory name (a string)."
:type '(repeat (choice (const :tag "custom-theme-directory"
custom-theme-directory)
(const :tag "Built-in theme directory" t)