aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/xdisp.c4
1 files changed, 2 insertions, 2 deletions
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)
7187 int enabled_p = !NILP (PROP (TOOL_BAR_ITEM_ENABLED_P)); 7187 int enabled_p = !NILP (PROP (TOOL_BAR_ITEM_ENABLED_P));
7188 int selected_p = !NILP (PROP (TOOL_BAR_ITEM_SELECTED_P)); 7188 int selected_p = !NILP (PROP (TOOL_BAR_ITEM_SELECTED_P));
7189 int hmargin, vmargin, relief, idx, end; 7189 int hmargin, vmargin, relief, idx, end;
7190 extern Lisp_Object QCrelief, QCmargin, QCalgorithm, Qimage; 7190 extern Lisp_Object QCrelief, QCmargin, QCconversion, Qimage;
7191 extern Lisp_Object Qlaplace; 7191 extern Lisp_Object Qlaplace;
7192 7192
7193 /* If image is a vector, choose the image according to the 7193 /* If image is a vector, choose the image according to the
@@ -7277,7 +7277,7 @@ build_desired_tool_bar_string (f)
7277 for the disabled state, make the image appear disabled by 7277 for the disabled state, make the image appear disabled by
7278 applying an appropriate algorithm to it. */ 7278 applying an appropriate algorithm to it. */
7279 if (!enabled_p && idx < 0) 7279 if (!enabled_p && idx < 0)
7280 plist = Fplist_put (plist, QCalgorithm, Qdisabled); 7280 plist = Fplist_put (plist, QCconversion, Qdisabled);
7281 7281
7282 /* Put a `display' text property on the string for the image to 7282 /* Put a `display' text property on the string for the image to
7283 display. Put a `menu-item' property on the string that gives 7283 display. Put a `menu-item' property on the string that gives