From 55702e89b8a408d0037911009c01c9536541907e Mon Sep 17 00:00:00 2001 From: Andreas Schwab Date: Thu, 1 Jul 2010 00:58:19 +0200 Subject: [PATCH] * startup.el (command-line): Don't call tool-bar-setup in a tty-only build. --- lisp/ChangeLog | 5 +++++ lisp/startup.el | 9 +++++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index e32ff83ff51..c617ee32362 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2010-06-30 Andreas Schwab + + * startup.el (command-line): Don't call tool-bar-setup in a + tty-only build. + 2010-06-30 Chong Yidong * ruler-mode.el (ruler--save-header-line-format): New fun. diff --git a/lisp/startup.el b/lisp/startup.el index e954409497a..76e11491c0c 100644 --- a/lisp/startup.el +++ b/lisp/startup.el @@ -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. -- 2.39.2