diff options
| author | Chong Yidong <cyd@stupidchicken.com> | 2006-01-02 15:11:14 +0000 |
|---|---|---|
| committer | Chong Yidong <cyd@stupidchicken.com> | 2006-01-02 15:11:14 +0000 |
| commit | d358aa106d66961f4750337f3a5b3048a44e4069 (patch) | |
| tree | 8e09f5c41477f0e872d3fc621436646b76c21e21 /lisp/cus-face.el | |
| parent | 55262b16df717fe533ea4ad23dac3f02398c9055 (diff) | |
| download | emacs-d358aa106d66961f4750337f3a5b3048a44e4069.tar.gz | |
* custom.el: Move Custom Themes commentary to start of theme code.
(custom-known-themes): Rename `standard' theme to `changed'.
(custom-push-theme): Caller no longer specifies what theme to use
when doing `reset'---the setting is simply removed from the theme.
Delete MODE from `theme-value' and `theme-settings' properties.
(custom-declare-theme): Ignore &rest args since we don't use them.
(custom-loaded-themes): Delete variable.
(custom-theme-load-themes, custom-theme-loaded-p)
(custom-theme-value): Delete functions.
(custom-declare-theme): Signal error on invalid theme names.
(provide-theme): custom-loaded-themes was deleted.
(load-theme): Load the file unconditionally.
(enable-theme): Call `load-theme' if theme is undefined.
(custom-enabled-themes): Only update value for successful loads.
(disable-theme): Complete from enabled themes when interactive.
(custom-variable-theme-value): Calculate theme value directly.
(custom-theme-reset-variables, custom-reset-variables): Mark as
XEmacs compatibility functions. We don't actually use these.
* cus-edit.el (custom-variable-state-set): Use
custom-variable-theme-value instead of custom-theme-value.
(custom-face-state-set): Rename `standard' theme to `changed'.
(custom-save-variables, custom-save-faces): Delete unneeded
references to custom-reset-variables.
(custom-save-resets): Delete function.
(custom-save-variables, custom-save-faces): MODE argument deleted.
(custom-save-variables, custom-save-faces): Ignore theme values.
* cus-face.el (custom-theme-reset-faces): Mark as XEmacs
compatibility function.
Diffstat (limited to 'lisp/cus-face.el')
| -rw-r--r-- | lisp/cus-face.el | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/lisp/cus-face.el b/lisp/cus-face.el index 66713c28661..ba8e21c8a4c 100644 --- a/lisp/cus-face.el +++ b/lisp/cus-face.el @@ -350,17 +350,20 @@ FACE's list property `theme-face' \(using `custom-push-theme')." (custom-push-theme 'theme-face face theme 'set spec)) (setq args (cdr (cdr args)))))))) +;; XEmacs compability function. In XEmacs, when you reset a Custom +;; Theme, you have to specify the theme to reset it to. We just apply +;; the next theme. ;;;###autoload (defun custom-theme-reset-faces (theme &rest args) "Reset the specs in THEME of some faces to their specs in other themes. Each of the arguments ARGS has this form: - (FACE FROM-THEME) + (FACE IGNORED) -This means reset FACE to its value in FROM-THEME." +This means reset FACE. The argument IGNORED is ignored." (custom-check-theme theme) (dolist (arg args) - (custom-push-theme 'theme-face (car arg) theme 'reset (cadr arg)))) + (custom-push-theme 'theme-face (car arg) theme 'reset))) ;;;###autoload (defun custom-reset-faces (&rest args) |