* startup.el (command-line): Enable tool-bar-mode as long as it is

not suppressed by X resources, regardless of the terminal.

* tool-bar.el (tool-bar-mode): Only change tool-bar-lines on
graphical terminals.
(tool-bar-setup): No-op if called on a tty.

lisp/ChangeLog

+2008-10-09  Chong Yidong  <cyd@stupidchicken.com>
+
+	* startup.el (command-line): Enable tool-bar-mode as long as it is
+	not suppressed by X resources, regardless of the terminal.
+
+	* tool-bar.el (tool-bar-mode): Only change tool-bar-lines on
+	graphical terminals.
+	(tool-bar-setup): No-op if called on a tty.
+
 2008-10-09  Eli Zaretskii  <eliz@gnu.org>
 	* frame.el (make-frame-on-tty): Use "F" inside interactive.  Support