diff options
| author | Chong Yidong | 2008-06-10 19:56:42 +0000 |
|---|---|---|
| committer | Chong Yidong | 2008-06-10 19:56:42 +0000 |
| commit | 7ecc4011370164dfea614c338a6732b3074d688c (patch) | |
| tree | e8ace8099e1df66e217958be9547697ddb2b712c | |
| parent | ba858bf98db2566732ebcd89ec7c3407bdfff949 (diff) | |
| download | emacs-7ecc4011370164dfea614c338a6732b3074d688c.tar.gz emacs-7ecc4011370164dfea614c338a6732b3074d688c.zip | |
(face-spec-recalc): When the face is set using Customize, avoid
recalculating it twice.
| -rw-r--r-- | lisp/faces.el | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lisp/faces.el b/lisp/faces.el index 5537fbef6c3..302cf6c02d8 100644 --- a/lisp/faces.el +++ b/lisp/faces.el | |||
| @@ -1506,8 +1506,9 @@ This applies the defface/custom spec first, then the custom theme specs, | |||
| 1506 | then the override spec." | 1506 | then the override spec." |
| 1507 | (face-spec-reset-face face frame) | 1507 | (face-spec-reset-face face frame) |
| 1508 | (let ((face-sym (or (get face 'face-alias) face))) | 1508 | (let ((face-sym (or (get face 'face-alias) face))) |
| 1509 | (face-spec-set-2 face frame | 1509 | (or (get face 'customized-face) |
| 1510 | (face-user-default-spec face)) | 1510 | (get face 'saved-face) |
| 1511 | (face-spec-set-2 face frame (face-default-spec face))) | ||
| 1511 | (let ((theme-faces (reverse (get face-sym 'theme-face)))) | 1512 | (let ((theme-faces (reverse (get face-sym 'theme-face)))) |
| 1512 | (dolist (spec theme-faces) | 1513 | (dolist (spec theme-faces) |
| 1513 | (face-spec-set-2 face frame (cadr spec)))) | 1514 | (face-spec-set-2 face frame (cadr spec)))) |