Commit be676094 authored by Gerd Moellmann's avatar Gerd Moellmann
Browse files

(tool_bar_item_info): Avoid calling Fget_text_property

with invalid position.
parent 9f8bbf0f
2001-11-17 Gerd Moellmann <>
* xdisp.c (tool_bar_item_info): Avoid calling Fget_text_property
with invalid position.
2001-11-16 Richard M. Stallman <>
* syswait.h: Delete conditionals for HPUX7, ISC 4.1, and convex.
......@@ -7935,11 +7935,18 @@ tool_bar_item_info (f, glyph, prop_idx)
Lisp_Object prop;
int success_p;
int charpos;
/* This function can be called asynchronously, which means we must
exclude any possibility that Fget_text_property signals an
error. */
charpos = min (XSTRING (f->current_tool_bar_string)->size, glyph->charpos);
charpos = max (0, charpos);
/* Get the text property `menu-item' at pos. The value of that
property is the start index of this item's properties in
F->tool_bar_items. */
prop = Fget_text_property (make_number (glyph->charpos),
prop = Fget_text_property (make_number (charpos),
Qmenu_item, f->current_tool_bar_string);
if (INTEGERP (prop))
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment