Fix for disable-theme/defface interaction (Bug#8889).

* lisp/cus-face.el (custom-declare-face): Call custom-theme-recalc face
anytime existing face settings are present.

2 files changed, 30 insertions, 24 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 755afbfeff6..012397968d9 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2011-06-18  Chong Yidong  <cyd@stupidchicken.com>
 
+        * cus-face.el (custom-declare-face): Call custom-theme-recalc face
+        anytime existing face settings are present (Bug#8889).
+
         * progmodes/delphi.el (delphi-mode-syntax-table): Use defvar.
         (delphi-mode): Use define-derived-mode to inherit from prog-mode.
         Remove unused argument.
diff --git a/lisp/cus-face.el b/lisp/cus-face.el
index 90f21f32149..c23632ab885 100644
--- a/lisp/cus-face.el
+++ b/lisp/cus-face.el
@@ -34,30 +34,33 @@
 (defun custom-declare-face (face spec doc &rest args)
   "Like `defface', but FACE is evaluated as a normal argument."
   (unless (get face 'face-defface-spec)
-    (unless (facep face)
-      ;; If the user has already created the face, respect that.
-      (let ((value (or (get face 'saved-face) spec))
-            (have-window-system (memq initial-window-system '(x w32))))
-        ;; Create global face.
-        (make-empty-face face)
-        ;; Create frame-local faces
-        (dolist (frame (frame-list))
-          (face-spec-set-2 face frame value)
-          (when (memq (window-system frame) '(x w32 ns))
-            (setq have-window-system t)))
-        ;; When making a face after frames already exist
-        (if have-window-system
-            (make-face-x-resource-internal face))))
-    ;; Don't record SPEC until we see it causes no errors.
-    (put face 'face-defface-spec (purecopy spec))
-    (push (cons 'defface face) current-load-list)
-    (when (and doc (null (face-documentation face)))
-      (set-face-documentation face (purecopy doc)))
-    (custom-handle-all-keywords face args 'custom-face)
-    (run-hooks 'custom-define-hook)
-    ;; If the face has an existing theme setting, recalculate it.
-    (if (get face 'theme-face)
-        (custom-theme-recalc-face face)))
+    (let ((facep (facep face)))
+      (unless facep
+        ;; If the user has already created the face, respect that.
+        (let ((value (or (get face 'saved-face) spec))
+              (have-window-system (memq initial-window-system '(x w32))))
+          ;; Create global face.
+          (make-empty-face face)
+          ;; Create frame-local faces
+          (dolist (frame (frame-list))
+            (face-spec-set-2 face frame value)
+            (when (memq (window-system frame) '(x w32 ns))
+              (setq have-window-system t)))
+          ;; When making a face after frames already exist
+          (if have-window-system
+              (make-face-x-resource-internal face))))
+      ;; Don't record SPEC until we see it causes no errors.
+      (put face 'face-defface-spec (purecopy spec))
+      (push (cons 'defface face) current-load-list)
+      (when (and doc (null (face-documentation face)))
+        (set-face-documentation face (purecopy doc)))
+      (custom-handle-all-keywords face args 'custom-face)
+      (run-hooks 'custom-define-hook)
+      ;; If the face had existing settings, recalculate it.  For
+      ;; example, the user might load a theme with a face setting, and
+      ;; later load a library defining that face.
+      (if facep
+          (custom-theme-recalc-face face))))
   face)
 
 ;;; Face attributes.