* xdisp.c (build_desired_tool_bar_string): Use :conversion instead

of :algorithm.

diff --git a/src/xdisp.c b/src/xdisp.c
index 15f950c5e778a246b155a63ea520aeb223ae73d2..bdbef8a11438c97ca36546d6bcbf55da6b3350f3 100644 (file)
--- 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