Handle calling defface on a face with existing theme settings (Bug#8454).

* lisp/cus-face.el (custom-declare-face): Call custom-theme-recalc-face if
the face has existing theme settings.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 488bd07a632234283a513d64e102283140c78fb9..60b462e106bfeab2f70b1440f4c98a450ba53d54 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2011-05-08  Chong Yidong  <cyd@stupidchicken.com>
+
+       * cus-face.el (custom-declare-face): Call custom-theme-recalc-face
+       if the face has existing theme settings (Bug#8454).
+
 2011-05-08  Ralph Schleicher  <rs@ralph-schleicher.de>
 
        * progmodes/perl-mode.el (perl-imenu-generic-expression): Only

diff --git a/lisp/cus-face.el b/lisp/cus-face.el
index f813b5b84d11d7d7ef2e1833ef96691e7b70fb02..90f21f321497f1a5d8ae5e6c19f266c17a7aab7d 100644 (file)
--- a/lisp/cus-face.el
+++ b/lisp/cus-face.el
@@ -34,28 +34,30 @@
 (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)
-    (when (fboundp 'facep)
-      (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)))))
+    (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))
+    (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)))
   face)
 
 ;;; Face attributes.