/[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.671.4.14 by gerd, Tue Oct 30 17:03:09 2001 UTC revision 1.671.4.15 by gerd, Sat Nov 17 10:47:37 2001 UTC
# Line 7945  tool_bar_item_info (f, glyph, prop_idx) Line 7945  tool_bar_item_info (f, glyph, prop_idx)
7945  {  {
7946    Lisp_Object prop;    Lisp_Object prop;
7947    int success_p;    int success_p;
7948      int charpos;
7949    
7950      /* This function can be called asynchronously, which means we must
7951         exclude any possibility that Fget_text_property signals an
7952         error.  */
7953      charpos = min (XSTRING (f->current_tool_bar_string)->size, glyph->charpos);
7954      charpos = max (0, charpos);
7955        
7956    /* Get the text property `menu-item' at pos. The value of that    /* Get the text property `menu-item' at pos. The value of that
7957       property is the start index of this item's properties in       property is the start index of this item's properties in
7958       F->tool_bar_items.  */       F->tool_bar_items.  */
7959    prop = Fget_text_property (make_number (glyph->charpos),    prop = Fget_text_property (make_number (charpos),
7960                               Qmenu_item, f->current_tool_bar_string);                               Qmenu_item, f->current_tool_bar_string);
7961    if (INTEGERP (prop))    if (INTEGERP (prop))
7962      {      {

Legend:
Removed from v.1.671.4.14  
changed lines
  Added in v.1.671.4.15

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