[Emacs-diffs] /srv/bzr/emacs/trunk r107626: * faces.el (face-spec-reset-face): Don't run display-graphic-p if undefined.

[Chong Yidong]

------------------------------------------------------------
revno: 107626
committer: Chong Yidong <address@hidden>
branch nick: trunk
timestamp: Sun 2012-03-18 22:18:01 +0800
message:
  * faces.el (face-spec-reset-face): Don't run display-graphic-p if undefined.
modified:
  lisp/ChangeLog
  lisp/faces.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-03-18 03:27:28 +0000
+++ b/lisp/ChangeLog    2012-03-18 14:18:01 +0000
@@ -1,3 +1,8 @@
+2012-03-18  Chong Yidong  <address@hidden>
+
+       * faces.el (face-spec-reset-face): Don't call display-graphic-p if
+       it is not yet defined (for temacs).
+
 2012-03-18  Leo Liu  <address@hidden>
 
        * net/rcirc.el (rcirc-cmd-quit): Allow quiting all servers with

=== modified file 'lisp/faces.el'
--- a/lisp/faces.el     2012-03-12 22:35:55 +0000
+++ b/lisp/faces.el     2012-03-18 14:18:01 +0000
@@ -1521,7 +1521,10 @@
             (append
              '(:underline nil :overline nil :strike-through nil
                :box nil :inverse-video nil :stipple nil :inherit nil)
-             (unless (display-graphic-p frame)
+             ;; `display-graphic-p' is unavailable when running
+             ;; temacs, prior to loading frame.el.
+             (unless (and (fboundp 'display-graphic-p)
+                          (display-graphic-p frame))
                '(:family "default" :foundry "default" :width normal
                  :height 1 :weight normal :slant normal
                  :foreground "unspecified-fg"