From: Chong Yidong <cyd@stupidchicken.com>
Date: Tue, 10 Jun 2008 19:56:42 +0000 (+0000)
Subject: (face-spec-recalc): When the face is set using Customize, avoid
X-Git-Tag: emacs-pretest-23.0.90~4911
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=7ecc4011370164dfea614c338a6732b3074d688c;p=emacs.git

(face-spec-recalc): When the face is set using Customize, avoid
recalculating it twice.
---

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,
 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))))