2 files changed, 9 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 359869027dc..15da02b3e3d 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2010-10-31  Glenn Morris  <rgm@gnu.org>
+
+        * frame.c (syms_of_frame) <tool-bar-mode>:
+        Default to nil if !HAVE_WINDOW_SYSTEM.  (Bug#7299)
+
 2010-10-31  Chong Yidong  <cyd@stupidchicken.com>
 
         * xterm.c (x_connection_closed): Print informative error message
diff --git a/src/frame.c b/src/frame.c
index 1f8ff8d562b..ba675be5b5f 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -4576,7 +4576,11 @@ See the command `tool-bar-mode' for a description of this minor mode.
 Setting this variable directly does not take effect;
 either customize it (see the info node `Easy Customization')
 or call the function `tool-bar-mode'.  */);
+#ifdef HAVE_WINDOW_SYSTEM
   Vtool_bar_mode = Qt;
+#else
+  Vtool_bar_mode = Qnil;
+#endif
 
   DEFVAR_KBOARD ("default-minibuffer-frame", Vdefault_minibuffer_frame,
                  doc: /* Minibufferless frames use this frame's minibuffer.