1 files changed, 9 insertions, 0 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f6c88dbfc53..bed3852d9f5 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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