Mercurial > emacs
changeset 109085:6a23dfd2048b
* startup.el (command-line): Don't call tool-bar-setup in a tty-only build.
| author | Andreas Schwab <schwab@linux-m68k.org> |
|---|---|
| date | Thu, 01 Jul 2010 00:58:19 +0200 |
| parents | 9e474f641740 |
| children | 49e082b9ea23 |
| files | lisp/ChangeLog lisp/startup.el |
| diffstat | 2 files changed, 10 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Wed Jun 30 18:43:52 2010 -0400 +++ b/lisp/ChangeLog Thu Jul 01 00:58:19 2010 +0200 @@ -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.
--- a/lisp/startup.el Wed Jun 30 18:43:52 2010 -0400 +++ b/lisp/startup.el Thu Jul 01 00:58:19 2010 +0200 @@ -899,10 +899,11 @@ (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.