* tool-bar.el (tool-bar-local-item)

(tool-bar-local-item-from-menu): Put the check for number of
display colors into the image expression.
(tool-bar-setup): Don't be a no-op on ttys.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c39b64e8a875e737586a547d0ae11ddbefe1c6a2..6441248bf95bf7cc4be0687e81cba4c67b3ed450 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+2008-10-11  Chong Yidong  <cyd@stupidchicken.com>
+
+       * tool-bar.el (tool-bar-local-item)
+       (tool-bar-local-item-from-menu): Put the check for number of
+       display colors into the image expression.
+       (tool-bar-setup): Don't be a no-op on ttys.
+
 2008-10-11  Romain Francoise  <romain@orebokech.com>
 
        * help.el (view-lossage): Fix docstring, lossage is now 300 keys.