# HG changeset patch
# User Gerd Moellmann <gerd@gnu.org>
# Date 969051699 0
# Node ID 41a7ba41a6ee4cd24fea5721d279b3fa28ffdf09
# Parent  aef83f9e7dac6d0a44ba323b809a1f82db7724f9
*** empty log message ***

diff -r aef83f9e7dac -r 41a7ba41a6ee lisp/ChangeLog
--- a/lisp/ChangeLog	Fri Sep 15 21:01:29 2000 +0000
+++ b/lisp/ChangeLog	Fri Sep 15 21:01:39 2000 +0000
@@ -1,5 +1,9 @@
 2000-09-15  Gerd Moellmann  <gerd@gnu.org>
 
+	* toolbar/toolbar.el (toolbar-add-item): Use the same image
+	specification if or if not tool-bar item contains an `:enabled'
+	property.
+
 	* menu-bar.el (menu-bar-files-menu): Disable ``Save'' if
 	current buffer has no file name.
 
diff -r aef83f9e7dac -r 41a7ba41a6ee src/ChangeLog
--- a/src/ChangeLog	Fri Sep 15 21:01:29 2000 +0000
+++ b/src/ChangeLog	Fri Sep 15 21:01:39 2000 +0000
@@ -1,5 +1,19 @@
 2000-09-15  Gerd Moellmann  <gerd@gnu.org>
 
+	* xfns.c (lookup_image): Build mask before applying an algorithm.
+	Recognize algorithm `disabled'.
+	(cross_disabled_images): New variable.
+	(COLOR_INTENSITY): New macro.
+	(x_detect_edges): Use COLOR_INTENSITY.
+	(x_disable_image): New function.
+	(syms_of_xfns): DEFVAR_BOOL cross_disabled_images.
+
+	* xdisp.c (build_desired_tool_bar_string): For a toolbar item in
+	disabled state, don't apply an image transformation algorithm if
+	the user specified an image for the disabled state.  Use
+	`:algorthm disabled' for creating a disabled item's image if the
+	user hasn't specified an image.
+
 	* xfns.c (ALLOC_XPM_COLORS): Define if we can use Emacs' color
 	allocation functions with the XPM lib.
 	(struct xpm_cached_color) [ALLOC_XPM_COLORS]: New structure.