[Emacs-diffs] /srv/bzr/emacs/trunk r109205: Fixes: debbugs:12042

[Andreas Schwab]

------------------------------------------------------------
revno: 109205
committer: Andreas Schwab <address@hidden>
branch nick: emacs
timestamp: Wed 2012-07-25 12:46:59 +0200
message:
  Fixes: debbugs:12042
  
  * faces.el (face-spec-reset-face): Fix last change.
modified:
  lisp/ChangeLog
  lisp/faces.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-07-25 09:43:12 +0000
+++ b/lisp/ChangeLog    2012-07-25 10:46:59 +0000
@@ -1,3 +1,7 @@
+2012-07-25  Andreas Schwab  <address@hidden>
+
+       * faces.el (face-spec-reset-face): Fix last change.  (Bug#12042)
+
 2012-07-25  Christopher Schmidt  <address@hidden>
 
        * emacs-lisp/pp.el (pp-display-expression): Select old selected

=== modified file 'lisp/faces.el'
--- a/lisp/faces.el     2012-07-18 14:00:09 +0000
+++ b/lisp/faces.el     2012-07-25 10:46:59 +0000
@@ -1547,14 +1547,14 @@
              ;; 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))