[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r101960: Fix 2010-10-12 change to cus
From: |
Chong Yidong |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r101960: Fix 2010-10-12 change to custom-theme-set-faces. |
Date: |
Thu, 14 Oct 2010 01:57:58 -0400 |
User-agent: |
Bazaar (2.0.3) |
------------------------------------------------------------
revno: 101960
committer: Chong Yidong <address@hidden>
branch nick: trunk
timestamp: Thu 2010-10-14 01:57:58 -0400
message:
Fix 2010-10-12 change to custom-theme-set-faces.
* cus-face.el (custom-theme-set-faces): Call custom-push-theme
only after checking the theme-face property.
modified:
lisp/ChangeLog
lisp/cus-face.el
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog 2010-10-14 03:55:18 +0000
+++ b/lisp/ChangeLog 2010-10-14 05:57:58 +0000
@@ -1,5 +1,8 @@
2010-10-14 Chong Yidong <address@hidden>
+ * cus-face.el (custom-theme-set-faces): Call custom-push-theme
+ only after checking the theme-face property.
+
* faces.el (face-spec-reset-face): Reset all attributes in one
single call to set-face-attribute.
(face-spec-match-p): Make it a defsubst.
=== modified file 'lisp/cus-face.el'
--- a/lisp/cus-face.el 2010-10-12 03:10:21 +0000
+++ b/lisp/cus-face.el 2010-10-14 05:57:58 +0000
@@ -328,15 +328,18 @@
;; is aliased to.
(if (get face 'face-alias)
(setq face (get face 'face-alias)))
- (custom-push-theme 'theme-face face theme 'set spec)
- (unless custom--inhibit-theme-enable
- ;; Now set the face spec.
+ (if custom--inhibit-theme-enable
+ ;; Just update theme settings.
+ (custom-push-theme 'theme-face face theme 'set spec)
+ ;; Update theme settings and set the face spec.
(let ((now (nth 2 entry))
(comment (nth 3 entry))
(oldspec (get face 'theme-face)))
(when (not (and oldspec (eq 'user (caar oldspec))))
(put face 'saved-face spec)
(put face 'saved-face-comment comment))
+ ;; Do this AFTER checking the `theme-face' property.
+ (custom-push-theme 'theme-face face theme 'set spec)
(when (or now immediate)
(put face 'force-face (if now 'rogue 'immediate)))
(when (or now immediate (facep face))
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r101960: Fix 2010-10-12 change to custom-theme-set-faces.,
Chong Yidong <=