aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/startup.el
diff options
context:
space:
mode:
Diffstat (limited to 'lisp/startup.el')
-rw-r--r--lisp/startup.el1
1 files changed, 1 insertions, 0 deletions
diff --git a/lisp/startup.el b/lisp/startup.el
index 0ffb6b8ffe..8c2fd91c3f 100644
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -902,6 +902,7 @@ opening the first frame (e.g. open a connection to an X server).")
;; even in tty frames, which means that there is a tool-bar if Emacs
;; later opens a graphical frame.
(unless (or noninteractive emacs-basic-display
+ (not (fboundp 'tool-bar-mode))
;; The tool-bar-lines parameter is nil if starting on a
;; tty; it is 0 if starting on a graphical display with
;; the toolbar disabled via X resources.