# HG changeset patch
# User Chong Yidong <cyd@stupidchicken.com>
# Date 1223580582 0
# Node ID 07dedfc8a63cf56ac5908e6ce6b8a61c636c78d4
# Parent  118d6dc744dba4509638de2d24a90571cb1e85ad
* 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.

diff -r 118d6dc744db -r 07dedfc8a63c lisp/ChangeLog
--- a/lisp/ChangeLog	Thu Oct 09 17:43:03 2008 +0000
+++ b/lisp/ChangeLog	Thu Oct 09 19:29:42 2008 +0000
@@ -1,3 +1,12 @@
+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