andros/emacs-gpu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* startup.el (command-line): Don't call tool-bar-setup in a tty-only build.

Browse source
This commit is contained in:
Andreas Schwab 2010-07-01 00:58:19 +02:00
parent dc9a226c7a
commit 55702e89b8
2 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lisp/ChangeLog
View file

@ -1,3 +1,8 @@
2010-06-30 Andreas Schwab <schwab@linux-m68k.org>
* startup.el (command-line): Don't call tool-bar-setup in a
tty-only build.
2010-06-30 Chong Yidong <cyd@stupidchicken.com>
* ruler-mode.el (ruler--save-header-line-format): New fun.

9
lisp/startup.el
View file

@ -899,10 +899,11 @@ opening the first frame (e.g. open a connection to an X server).")
(setq no-blinking-cursor t)))))
(frame-initialize))
;; Set up the tool-bar (even in tty frames, since Emacs might open a
;; graphical frame later).
(unless noninteractive
(tool-bar-setup))
(when (fboundp 'x-create-frame)
;; Set up the tool-bar (even in tty frames, since Emacs might open a
;; graphical frame later).
(unless noninteractive
(tool-bar-setup)))
;; Turn off blinking cursor if so specified in X resources. This is here
;; only because all other settings of no-blinking-cursor are here.