From: Glenn Morris <rgm@gnu.org>
Date: Fri, 18 Jan 2008 05:41:09 +0000 (+0000)
Subject: Richard M. Stallman  <rms at gnu.org>
X-Git-Tag: emacs-pretest-23.0.90~8522
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=279c44082ae75f8483460b5c7936416e8ef7df01;p=emacs.git

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 9984fd9dcd4..50bce510858 100644
--- 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 a0b1db517a2..7466913eb9a 100644
--- 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))))
 
 ;;; XEmacs compability functions