diff options
| -rw-r--r-- | lisp/ChangeLog | 3 | ||||
| -rw-r--r-- | lisp/cus-edit.el | 4 |
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 @@ 2013-12-18 Chong Yidong <cyd@gnu.org> + * cus-edit.el (custom-magic-alist): Fix "themed" description + (Bug#14348). + * custom.el (custom-push-theme): If custom--inhibit-theme-enable is non-nil, do not create a new entry in the symbol's theme-value 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." "\ something in this group has been set and saved.") (themed "o" custom-themed "\ THEMED." "\ -visible group members are all at standard values.") +visible group members are set by enabled themes.") (rogue "@" custom-rogue "\ NO CUSTOMIZATION DATA; not intended to be customized." "\ something in this group is not prepared for customization.") @@ -1961,6 +1961,8 @@ STATE is one of the following symbols: This item is marked for saving. `rogue' This item has no customization information. +`themed' + This item was set by an enabled Custom theme. `standard' This item is unchanged from the standard setting. |