diff options
| author | Chong Yidong <cyd@stupidchicken.com> | 2011-06-29 21:39:52 -0400 |
|---|---|---|
| committer | Chong Yidong <cyd@stupidchicken.com> | 2011-06-29 21:39:52 -0400 |
| commit | 658d8eb8fceb1d5f0f7a71c4f7145dd43b78081b (patch) | |
| tree | fac3229b9f3f5ed01817341dfa23a295c0c0937d /lisp/cus-theme.el | |
| parent | 732b9594ceab70733e55dba8dec85e7def3824b0 (diff) | |
| download | emacs-658d8eb8fceb1d5f0f7a71c4f7145dd43b78081b.tar.gz | |
Avoid calling customize-save-variable during startup (Bug#8720).
* lisp/cus-edit.el (customize-push-and-save): New function.
* lisp/files.el (hack-local-variables-confirm): Use it.
* lisp/custom.el (load-theme): New arg NO-CONFIRM. Use
customize-push-and-save (Bug#8720).
(custom-enabled-themes): Doc fix.
* lisp/cus-theme.el (customize-create-theme)
(custom-theme-merge-theme): Callers to load-theme changed.
Diffstat (limited to 'lisp/cus-theme.el')
| -rw-r--r-- | lisp/cus-theme.el | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/cus-theme.el b/lisp/cus-theme.el index 7f926c85e56..04a9e728b22 100644 --- a/lisp/cus-theme.el +++ b/lisp/cus-theme.el @@ -157,7 +157,7 @@ remove them from your saved Custom file.\n\n")) ;; Load the theme settings. (when theme (unless (eq theme 'user) - (load-theme theme t)) + (load-theme theme nil t)) (dolist (setting (get theme 'theme-settings)) (if (eq (car setting) 'theme-value) (progn (push (nth 1 setting) vars) @@ -326,7 +326,7 @@ SPEC, if non-nil, should be a face spec to which to set the widget." (unless (eq theme 'user) (unless (custom-theme-name-valid-p theme) (error "Invalid theme name `%s'" theme)) - (load-theme theme t)) + (load-theme theme nil t)) (let ((settings (reverse (get theme 'theme-settings)))) (dolist (setting settings) (funcall (if (eq (car setting) 'theme-value) |