From: Andreas Schwab <schwab@linux-m68k.org>
Date: Wed, 30 Jun 2010 22:58:19 +0000 (+0200)
Subject: * startup.el (command-line): Don't call tool-bar-setup in a tty-only build.
X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~438^2~51^2~88
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=55702e89b8a408d0037911009c01c9536541907e;p=emacs.git

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

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  <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.
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.