From: Andreas Schwab <schwab@linux-m68k.org>
Date: Wed, 25 Jul 2012 10:46:59 +0000 (+0200)
Subject: Fixes: debbugs:12042
X-Git-Tag: emacs-24.2.90~1083
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=67ada220af08d704fa30196ea5b8660dc088b832;p=emacs.git

Fixes: debbugs:12042

* faces.el (face-spec-reset-face): Fix last change.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 95f59c65fc7..a773e158e3c 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2012-07-25  Andreas Schwab  <schwab@linux-m68k.org>
+
+	* faces.el (face-spec-reset-face): Fix last change.  (Bug#12042)
+
 2012-07-25  Christopher Schmidt  <christopher@ch.ristopher.com>
 
 	* emacs-lisp/pp.el (pp-display-expression): Select old selected
diff --git a/lisp/faces.el b/lisp/faces.el
index a5b29823b62..2e1ba7798e9 100644
--- a/lisp/faces.el
+++ b/lisp/faces.el
@@ -1547,14 +1547,14 @@ If SPEC is nil, return nil."
 	      ;; temacs, prior to loading frame.el.
 	      (unless (and (fboundp 'display-graphic-p)
 			   (display-graphic-p frame))
-		'(:family "default" :foundry "default" :width normal
+		`(:family "default" :foundry "default" :width normal
 		  :height 1 :weight normal :slant normal
-		  :foreground (if (frame-parameter nil 'reverse)
-				  "unspecified-bg"
-				"unspecified-fg")
-		  :background (if (frame-parameter nil 'reverse)
-				  "unspecified-fg"
-				"unspecified-bg"))))
+		  :foreground ,(if (frame-parameter nil 'reverse)
+				   "unspecified-bg"
+				 "unspecified-fg")
+		  :background ,(if (frame-parameter nil 'reverse)
+				   "unspecified-fg"
+				 "unspecified-bg"))))
 	   ;; For all other faces, unspecify all attributes.
 	   (apply 'append
 		  (mapcar (lambda (x) (list (car x) 'unspecified))