[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] trunk r115589: Fix loading of themes when NO-ENABLE is t.
From: |
Chong Yidong |
Subject: |
[Emacs-diffs] trunk r115589: Fix loading of themes when NO-ENABLE is t. |
Date: |
Wed, 18 Dec 2013 08:53:35 +0000 |
User-agent: |
Bazaar (2.6b2) |
------------------------------------------------------------
revno: 115589
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/14664
committer: Chong Yidong <address@hidden>
branch nick: trunk
timestamp: Wed 2013-12-18 16:53:22 +0800
message:
Fix loading of themes when NO-ENABLE is t.
* lisp/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.
modified:
lisp/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1432
lisp/custom.el custom.el-20091113204419-o5vbwnq5f7feedwu-1093
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog 2013-12-18 07:54:20 +0000
+++ b/lisp/ChangeLog 2013-12-18 08:53:22 +0000
@@ -1,5 +1,9 @@
2013-12-18 Chong Yidong <address@hidden>
+ * 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).
+
* cus-theme.el (custom-new-theme-mode-map): Add bindings
(Bug#15674).
=== modified file 'lisp/custom.el'
--- a/lisp/custom.el 2013-10-30 02:14:16 +0000
+++ b/lisp/custom.el 2013-12-18 08:53:22 +0000
@@ -869,20 +869,21 @@
(setcar (cdr setting) value)))
;; Add a new setting:
(t
- (unless old
- ;; If the user changed a variable outside of Customize, save
- ;; the value to a fake theme, `changed'. If the theme is
- ;; later disabled, we use this to bring back the old value.
- ;;
- ;; For faces, we just use `face-new-frame-defaults' to
- ;; recompute when the theme is disabled.
- (when (and (eq prop 'theme-value)
- (boundp symbol))
- (let ((sv (get symbol 'standard-value))
- (val (symbol-value symbol)))
- (unless (and sv (equal (eval (car sv)) val))
- (setq old `((changed ,(custom-quote val))))))))
- (put symbol prop (cons (list theme value) old))
+ (unless custom--inhibit-theme-enable
+ (unless old
+ ;; If the user changed a variable outside of Customize, save
+ ;; the value to a fake theme, `changed'. If the theme is
+ ;; later disabled, we use this to bring back the old value.
+ ;;
+ ;; For faces, we just use `face-new-frame-defaults' to
+ ;; recompute when the theme is disabled.
+ (when (and (eq prop 'theme-value)
+ (boundp symbol))
+ (let ((sv (get symbol 'standard-value))
+ (val (symbol-value symbol)))
+ (unless (and sv (equal (eval (car sv)) val))
+ (setq old `((changed ,(custom-quote val))))))))
+ (put symbol prop (cons (list theme value) old)))
(put theme 'theme-settings
(cons (list prop symbol theme value) theme-settings))))))
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] trunk r115589: Fix loading of themes when NO-ENABLE is t.,
Chong Yidong <=