martin/emacs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* xmenu.c (set_frame_menubar): Don't mishandle vectors with no nils.

Browse Source
This commit is contained in:
Paul Eggert
2011-05-11 23:46:26 -07:00
parent 5235bd3eb1
commit d89eb65e6d
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/ChangeLog
View File

@@ -1,3 +1,7 @@
2011-05-12 Paul Eggert <eggert@cs.ucla.edu>
* xmenu.c (set_frame_menubar): Don't mishandle vectors with no nils.
2011-05-11 Paul Eggert <eggert@cs.ucla.edu>
* xterm.c: Use EMACS_INT for Emacs modifiers, and int for X modifiers.

5
src/xmenu.c
View File

@@ -922,7 +922,7 @@ set_frame_menubar (FRAME_PTR f, int first_time, int deep_p)
#endif
Lisp_Object items;
widget_value *wv, *first_wv, *prev_wv = 0;
EMACS_UINT i, last_i = 0;
EMACS_UINT i, last_i;
int *submenu_start, *submenu_end;
int *submenu_top_level_items, *submenu_n_panes;
@@ -1021,8 +1021,6 @@ set_frame_menubar (FRAME_PTR f, int first_time, int deep_p)
{
Lisp_Object key, string, maps;
last_i = i;
key = XVECTOR (items)->contents[4 * i];
string = XVECTOR (items)->contents[4 * i + 1];
maps = XVECTOR (items)->contents[4 * i + 2];
@@ -1039,6 +1037,7 @@ set_frame_menubar (FRAME_PTR f, int first_time, int deep_p)
submenu_end[i] = menu_items_used;
}
last_i = i;
finish_menu_items ();
/* Convert menu_items into widget_value trees