Richard M. Stallman <rms at gnu.org>

(custom-theme-recalc-face): Use face-spec-set rather than
face-spec-recalc.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 9984fd9dcd41ed5e01df543c775a8c36cd94ec70..50bce510858ed3cc959254bb34161035417b241c 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2008-01-18  Richard Stallman  <rms@gnu.org>
+
+       * custom.el (custom-theme-recalc-face): Use face-spec-set rather
+       than face-spec-recalc.
+
 2008-01-18  Glenn Morris  <rgm@gnu.org>
 
        * ibuffer.el (ibuffer-mode): Fix typo in previous change.

diff --git a/lisp/custom.el b/lisp/custom.el
index a0b1db517a2bb65f6bf3ff45e7771ffecdf8305f..7466913eb9a052d962caa9e6c043fbf43b60dcf3 100644 (file)
--- a/lisp/custom.el
+++ b/lisp/custom.el
@@ -1176,7 +1176,9 @@ This function returns nil if no custom theme specifies a value for VARIABLE."
 (defun custom-theme-recalc-face (face)
   "Set FACE according to currently enabled custom themes."
   (if (facep face)
-      (face-spec-recalc face)))
+      (face-spec-set face
+                     (get (or (get face 'face-alias) face)
+                          'face-override-spec))))
 \f
 ;;; XEmacs compability functions