(command-line): Don't invoke tool-bar-mode if it is not fboundp.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index bed3852d9f5057c6fba0ea43e74ded14a59da6f7..cb4bd363f8cd51c5f9c3c9e71bec9042b0388d47 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2008-10-10  Eli Zaretskii  <eliz@gnu.org>
+
+       * startup.el (command-line): Don't invoke tool-bar-mode if it is
+       not fboundp.
+
 2008-10-09  Chong Yidong  <cyd@stupidchicken.com>
 
        * startup.el (command-line): Enable tool-bar-mode as long as it is

diff --git a/lisp/startup.el b/lisp/startup.el
index 0ffb6b8ffec3acdd359dcfefb26faa4cf81b1a07..8c2fd91c3f721339e6530a3bb3b74702be2309e8 100644 (file)
--- 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.