# HG changeset patch
# User Richard M. Stallman <rms@gnu.org>
# Date 817419052 0
# Node ID 645e14e39a2b2abec10fa5b2ec927a052e3cf990
# Parent  acde2327c000e5c7c05a5c0de42401e10b371e9e
(set_frame_menubar): When called with deep_p == 0,
that invalidates the previous f->menu_bar_vector.

diff -r acde2327c000 -r 645e14e39a2b src/xmenu.c
--- a/src/xmenu.c	Sat Nov 25 18:21:17 1995 +0000
+++ b/src/xmenu.c	Sun Nov 26 20:50:52 1995 +0000
@@ -1654,7 +1654,7 @@
 	if (menu_items_used == i
 	    || (previous_items[i] != XVECTOR (menu_items)->contents[i]))
 	  break;
-      if (i == menu_items_used && i == previous_menu_items_used)
+      if (i == menu_items_used && i == previous_menu_items_used && i != 0)
 	{
 	  free_menubar_widget_value_tree (first_wv);
 	  menu_items = Qnil;
@@ -1704,6 +1704,11 @@
 	    first_wv->contents = wv;
 	  prev_wv = wv;
 	}
+
+      /* Forget what we thought we knew about what is in the
+	 detailed contents of the menu bar menus.
+	 Changing the top level always destroys the contents.  */
+      f->menu_bar_items_used = 0;
     }
 
   /* Create or update the menu bar widget.  */