/[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.230.4.6 by miles, Sat Sep 4 09:28:16 2004 UTC revision 1.230.4.7 by miles, Thu Sep 16 00:12:26 2004 UTC
# Line 1  Line 1 
1  /* X Communication module for terminals which understand the X protocol.  /* X Communication module for terminals which understand the X protocol.
2     Copyright (C) 1986, 88, 93, 94, 96, 99, 2000, 2001, 2003     Copyright (C) 1986, 1988, 1993, 1994, 1996, 1999, 2000, 2001, 2003, 2004
3     Free Software Foundation, Inc.     Free Software Foundation, Inc.
4    
5  This file is part of GNU Emacs.  This file is part of GNU Emacs.
# Line 1801  update_submenu_strings (first_wv) Line 1801  update_submenu_strings (first_wv)
1801    
1802    for (wv = first_wv; wv; wv = wv->next)    for (wv = first_wv; wv; wv = wv->next)
1803      {      {
1804        if (wv->lname && ! NILP (wv->lname))        if (STRINGP (wv->lname))
1805          {          {
1806            wv->name = SDATA (wv->lname);            wv->name = SDATA (wv->lname);
1807    
# Line 1815  update_submenu_strings (first_wv) Line 1815  update_submenu_strings (first_wv)
1815              }              }
1816          }          }
1817    
1818        if (wv->lkey && ! NILP (wv->lkey))        if (STRINGP (wv->lkey))
1819          wv->key = SDATA (wv->lkey);          wv->key = SDATA (wv->lkey);
1820    
1821        if (wv->contents)        if (wv->contents)
# Line 1888  set_frame_menubar (f, first_time, deep_p Line 1888  set_frame_menubar (f, first_time, deep_p
1888  #endif  #endif
1889    Lisp_Object items;    Lisp_Object items;
1890    widget_value *wv, *first_wv, *prev_wv = 0;    widget_value *wv, *first_wv, *prev_wv = 0;
1891    int i, last_i;    int i, last_i = 0;
1892    int *submenu_start, *submenu_end;    int *submenu_start, *submenu_end;
1893    int *submenu_top_level_items, *submenu_n_panes;    int *submenu_top_level_items, *submenu_n_panes;
1894    

Legend:
Removed from v.1.230.4.6  
changed lines
  Added in v.1.230.4.7

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