From: Gerd Moellmann <gerd@gnu.org>
Date: Wed, 17 Jan 2001 13:14:45 +0000 (+0000)
Subject: * xdisp.c (build_desired_tool_bar_string): Use :conversion instead
X-Git-Tag: emacs-pretest-21.0.96~246
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=ecd01a0e00eb2cf1b2eb45178e2ce5525708d3a2;p=emacs.git

* xdisp.c (build_desired_tool_bar_string): Use :conversion instead
of :algorithm.
---

diff --git a/src/xdisp.c b/src/xdisp.c
index 15f950c5e77..bdbef8a1143 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -7187,7 +7187,7 @@ build_desired_tool_bar_string (f)
       int enabled_p = !NILP (PROP (TOOL_BAR_ITEM_ENABLED_P));
       int selected_p = !NILP (PROP (TOOL_BAR_ITEM_SELECTED_P));
       int hmargin, vmargin, relief, idx, end;
-      extern Lisp_Object QCrelief, QCmargin, QCalgorithm, Qimage;
+      extern Lisp_Object QCrelief, QCmargin, QCconversion, Qimage;
       extern Lisp_Object Qlaplace;
 
       /* If image is a vector, choose the image according to the
@@ -7277,7 +7277,7 @@ build_desired_tool_bar_string (f)
 	 for the disabled state, make the image appear disabled by
 	 applying an appropriate algorithm to it.  */
       if (!enabled_p && idx < 0)
-	plist = Fplist_put (plist, QCalgorithm, Qdisabled);
+	plist = Fplist_put (plist, QCconversion, Qdisabled);
       
       /* Put a `display' text property on the string for the image to
 	 display.  Put a `menu-item' property on the string that gives