# HG changeset patch
# User Chong Yidong <cyd@stupidchicken.com>
# Date 1213127802 0
# Node ID 09e6bd8a641ab06de3d7d4fd6ebb1105098c339d
# Parent  3050aaaeadc9bbeb0214af7d3d1aa84abff5f301
(face-spec-recalc): When the face is set using Customize, avoid
recalculating it twice.

diff -r 3050aaaeadc9 -r 09e6bd8a641a lisp/faces.el
--- 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))))