Mercurial > emacs
changeset 95787:09e6bd8a641a
(face-spec-recalc): When the face is set using Customize, avoid
recalculating it twice.
| author | Chong Yidong <cyd@stupidchicken.com> |
|---|---|
| date | Tue, 10 Jun 2008 19:56:42 +0000 |
| parents | 3050aaaeadc9 |
| children | 4542b29082c9 |
| files | lisp/faces.el |
| diffstat | 1 files changed, 3 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/faces.el Tue Jun 10 19:55:38 2008 +0000 +++ b/lisp/faces.el Tue Jun 10 19:56:42 2008 +0000 @@ -1506,8 +1506,9 @@ then the override spec." (face-spec-reset-face face frame) (let ((face-sym (or (get face 'face-alias) face))) - (face-spec-set-2 face frame - (face-user-default-spec face)) + (or (get face 'customized-face) + (get face 'saved-face) + (face-spec-set-2 face frame (face-default-spec face))) (let ((theme-faces (reverse (get face-sym 'theme-face)))) (dolist (spec theme-faces) (face-spec-set-2 face frame (cadr spec))))