/[emacs]/emacs/src/xdisp.c
ViewVC logotype

Diff of /emacs/src/xdisp.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.705 by kfstorm, Fri Nov 16 13:09:11 2001 UTC revision 1.706 by gerd, Sat Nov 17 10:46:24 2001 UTC
# Line 7935  tool_bar_item_info (f, glyph, prop_idx) Line 7935  tool_bar_item_info (f, glyph, prop_idx)
7935  {  {
7936    Lisp_Object prop;    Lisp_Object prop;
7937    int success_p;    int success_p;
7938      int charpos;
7939    
7940      /* This function can be called asynchronously, which means we must
7941         exclude any possibility that Fget_text_property signals an
7942         error.  */
7943      charpos = min (XSTRING (f->current_tool_bar_string)->size, glyph->charpos);
7944      charpos = max (0, charpos);
7945        
7946    /* Get the text property `menu-item' at pos. The value of that    /* Get the text property `menu-item' at pos. The value of that
7947       property is the start index of this item's properties in       property is the start index of this item's properties in
7948       F->tool_bar_items.  */       F->tool_bar_items.  */
7949    prop = Fget_text_property (make_number (glyph->charpos),    prop = Fget_text_property (make_number (charpos),
7950                               Qmenu_item, f->current_tool_bar_string);                               Qmenu_item, f->current_tool_bar_string);
7951    if (INTEGERP (prop))    if (INTEGERP (prop))
7952      {      {

Legend:
Removed from v.1.705  
changed lines
  Added in v.1.706

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26