diff options
| author | Chong Yidong <cyd@stupidchicken.com> | 2006-01-04 15:56:08 +0000 |
|---|---|---|
| committer | Chong Yidong <cyd@stupidchicken.com> | 2006-01-04 15:56:08 +0000 |
| commit | 73e60f534c975124124973b03fa76072a769b6c6 (patch) | |
| tree | 0387db4b493293c76b65e5e0c93e92787db0a3ed /lisp/custom.el | |
| parent | 205c40f84bf25827c95e1eeb136faaa4c85a8bcb (diff) | |
| download | emacs-73e60f534c975124124973b03fa76072a769b6c6.tar.gz | |
* cus-edit.el (custom-reset-menu, custom-reset, Custom-mode-menu)
(custom-variable-menu, custom-face-menu, custom-group-menu)
(custom-buffer-create-internal): Change "Reset" to "Show".
Reorder menu items.
(custom-link): New face for Info links.
(custom-buffer-create-internal, custom-manual): Use it.
* wid-edit.el (widget-default-mouse-face-get): New function.
(widget-specify-button): Handle mouse-face like button-face.
* custom.el (load-theme): Clear old theme settings if reloading.
Diffstat (limited to 'lisp/custom.el')
| -rw-r--r-- | lisp/custom.el | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/lisp/custom.el b/lisp/custom.el index 6a7c6408381..6267febe0d5 100644 --- a/lisp/custom.el +++ b/lisp/custom.el @@ -1007,11 +1007,17 @@ property `theme-feature' (which is usually a symbol created by (enable-theme 'user))) (defun load-theme (theme) - "Try to load a theme's settings from its file. + "Load a theme's settings from its file. This also enables the theme; use `disable-theme' to disable it." ;; Note we do no check for validity of the theme here. ;; This allows to pull in themes by a file-name convention (interactive "SCustom theme name: ") + ;; If reloading, clear out the old theme settings. + (when (custom-theme-p theme) + (disable-theme theme) + (put theme 'theme-settings nil) + (put theme 'theme-feature nil) + (put theme 'theme-documentation nil)) (let ((load-path (if (file-directory-p custom-theme-directory) (cons custom-theme-directory load-path) load-path))) |