procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* faces.el (face-spec-reset-face): Don't run display-graphic-p if undefined.

Browse source
This commit is contained in:
Chong Yidong 2012-03-18 22:18:01 +08:00
parent 153609342a
commit 4c5779ab90
2 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lisp/ChangeLog
View file

@ -1,3 +1,8 @@
2012-03-18 Chong Yidong <cyd@gnu.org>
* 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 <sdl.web@gmail.com>
* net/rcirc.el (rcirc-cmd-quit): Allow quiting all servers with

5
lisp/faces.el
View file

@ -1521,7 +1521,10 @@ If SPEC is nil, return nil."
(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"