aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChong Yidong2013-12-18 16:58:22 +0800
committerChong Yidong2013-12-18 16:58:22 +0800
commit0081bc840465496f15687142f77b2f81795edb8f (patch)
tree62b2ebe1f16ac28ba1227676e7f3056ddc534c43
parenta7ee9424b028b9dfd7a632aba73a93c1854e177a (diff)
downloademacs-0081bc840465496f15687142f77b2f81795edb8f.tar.gz
emacs-0081bc840465496f15687142f77b2f81795edb8f.zip
* cus-edit.el (custom-magic-alist): Fix "themed" description.
Fixes: debbugs:14348
-rw-r--r--lisp/ChangeLog3
-rw-r--r--lisp/cus-edit.el4
2 files changed, 6 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b4d4eca2f08..dd84a88d71a 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
12013-12-18 Chong Yidong <cyd@gnu.org> 12013-12-18 Chong Yidong <cyd@gnu.org>
2 2
3 * cus-edit.el (custom-magic-alist): Fix "themed" description
4 (Bug#14348).
5
3 * custom.el (custom-push-theme): If custom--inhibit-theme-enable 6 * custom.el (custom-push-theme): If custom--inhibit-theme-enable
4 is non-nil, do not create a new entry in the symbol's theme-value 7 is non-nil, do not create a new entry in the symbol's theme-value
5 or theme-face property; update theme-settings only (Bug#14664). 8 or theme-face property; update theme-settings only (Bug#14664).
diff --git a/lisp/cus-edit.el b/lisp/cus-edit.el
index 176440f91bb..7f0f4554322 100644
--- a/lisp/cus-edit.el
+++ b/lisp/cus-edit.el
@@ -1931,7 +1931,7 @@ SAVED and set." "\
1931something in this group has been set and saved.") 1931something in this group has been set and saved.")
1932 (themed "o" custom-themed "\ 1932 (themed "o" custom-themed "\
1933THEMED." "\ 1933THEMED." "\
1934visible group members are all at standard values.") 1934visible group members are set by enabled themes.")
1935 (rogue "@" custom-rogue "\ 1935 (rogue "@" custom-rogue "\
1936NO CUSTOMIZATION DATA; not intended to be customized." "\ 1936NO CUSTOMIZATION DATA; not intended to be customized." "\
1937something in this group is not prepared for customization.") 1937something in this group is not prepared for customization.")
@@ -1961,6 +1961,8 @@ STATE is one of the following symbols:
1961 This item is marked for saving. 1961 This item is marked for saving.
1962`rogue' 1962`rogue'
1963 This item has no customization information. 1963 This item has no customization information.
1964`themed'
1965 This item was set by an enabled Custom theme.
1964`standard' 1966`standard'
1965 This item is unchanged from the standard setting. 1967 This item is unchanged from the standard setting.
1966 1968