procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix 2010-10-12 change to custom-theme-set-faces.

Browse source 
* cus-face.el (custom-theme-set-faces): Call custom-push-theme
only after checking the theme-face property.
This commit is contained in:
Chong Yidong 2010-10-14 01:57:58 -04:00
parent 4983ddeaa8
commit de43f11b36
2 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
lisp/ChangeLog
View file

@ -1,5 +1,8 @@
2010-10-14 Chong Yidong <cyd@stupidchicken.com>
* 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.

9
lisp/cus-face.el
View file

@ -328,15 +328,18 @@ FACE's list property `theme-face' \(using `custom-push-theme')."
;; 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))