mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-04-19 12:30:47 -07:00
Code Issues Projects Releases Wiki Activity

(set_frame_menubar): Take into account that

Browse source 
f->menu_bar_vector can be nil, and not a vector.  From Ken Raeburn
<raeburn@gnu.org>.
This commit is contained in:
Gerd Moellmann 2001-07-30 08:12:46 +00:00
parent 291e3b68cf
commit 86c041835c
1 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/xmenu.c
View file

@ -1690,12 +1690,13 @@ set_frame_menubar (f, first_time, deep_p)
inhibit_garbage_collection ();
/* Save the frame's previous menu bar contents data. */
bcopy (XVECTOR (f->menu_bar_vector)->contents, previous_items,
previous_menu_items_used * sizeof (Lisp_Object));
if (previous_menu_items_used)
bcopy (XVECTOR (f->menu_bar_vector)->contents, previous_items,
previous_menu_items_used * sizeof (Lisp_Object));
/* Fill in the current menu bar contents. */
menu_items = f->menu_bar_vector;
menu_items_allocated = XVECTOR (menu_items)->size;
menu_items_allocated = VECTORP (menu_items) ? ASIZE (menu_items) : 0;
init_menu_items ();
for (i = 0; i < XVECTOR (items)->size; i += 4)
{