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

Diff of /emacs/src/xmenu.c

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

revision 1.225 by pj, Tue Nov 13 07:10:29 2001 UTC revision 1.226 by rms, Sun Dec 2 05:07:16 2001 UTC
# Line 246  init_menu_items () Line 246  init_menu_items ()
246    menu_items_submenu_depth = 0;    menu_items_submenu_depth = 0;
247  }  }
248    
249  /* Call at the end of generating the data in menu_items.  /* Call at the end of generating the data in menu_items.  */
    This fills in the number of items in the last pane.  */  
250    
251  static void  static void
252  finish_menu_items ()  finish_menu_items ()
# Line 1186  menu_highlight_callback (widget, id, cal Line 1185  menu_highlight_callback (widget, id, cal
1185    struct frame *f;    struct frame *f;
1186    Lisp_Object frame, help;    Lisp_Object frame, help;
1187    
1188    help = wv && wv->help ? build_string (wv->help) : Qnil;    help = wv ? wv->help : Qnil;
1189        
1190    /* Determine the frame for the help event.  */    /* Determine the frame for the help event.  */
1191    f = menubar_id_to_frame (id);    f = menubar_id_to_frame (id);
# Line 1535  single_submenu (item_key, item_name, map Line 1534  single_submenu (item_key, item_name, map
1534              abort ();              abort ();
1535    
1536            wv->selected = !NILP (selected);            wv->selected = !NILP (selected);
1537            if (STRINGP (help))            if (! STRINGP (help))
1538              wv->help = (char *) XSTRING (help)->data;              help = Qnil;
1539            else  
1540              wv->help = NULL;            wv->help = help;
1541    
1542            prev_wv = wv;            prev_wv = wv;
1543    
# Line 2133  xmenu_show (f, x, y, for_click, keymaps, Line 2132  xmenu_show (f, x, y, for_click, keymaps,
2132    
2133            wv->selected = !NILP (selected);            wv->selected = !NILP (selected);
2134    
2135            if (STRINGP (help))            if (! STRINGP (help))
2136              wv->help = (char *) XSTRING (help)->data;              help = Qnil;
2137            else  
2138              wv->help = NULL;            wv->help = help;
2139    
2140            prev_wv = wv;            prev_wv = wv;
2141    

Legend:
Removed from v.1.225  
changed lines
  Added in v.1.226

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