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

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e32ff83ff5119fdcd4e7464edcf77531624bbcf9..c617ee323622a0ba70d7472ad3c69c7235f64d1f 100644 (file)
--- 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 e954409497aeb92594ab571ac1d1f4a81741293d..76e11491c0c1cb97be10156fa6eb7ebbd25d0324 100644 (file)
--- 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.