[Emacs-diffs] Changes to emacs/lisp/startup.el,v

[Eli Zaretskii]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Eli Zaretskii <eliz>    08/10/10 08:53:14

Index: startup.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/startup.el,v
retrieving revision 1.510
retrieving revision 1.511
diff -u -b -r1.510 -r1.511
--- startup.el  9 Oct 2008 19:31:51 -0000       1.510
+++ startup.el  10 Oct 2008 08:53:14 -0000      1.511
@@ -902,6 +902,7 @@
   ;; 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.