From: Chong Yidong <cyd@stupidchicken.com>
Date: Sat, 11 Oct 2008 19:45:36 +0000 (+0000)
Subject: * tool-bar.el (tool-bar-local-item)
X-Git-Tag: emacs-pretest-23.0.90~2557
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=fe4d6c1877d205af63edd56b37185004d2df324f;p=emacs.git

* 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 c39b64e8a87..6441248bf95 100644
--- 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.