(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 5537fbef6c35dfe7f47a3069d470187d17a78c7b..302cf6c02d865c541e6599fbcfd2504f6b6309e9 100644 (file)
--- 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))))