(set_frame_menubar): Sync with version in xmenu.c.

(w32_menu_show): Sync with xmenu_show in xmenu.c.

diff --git a/src/ChangeLog b/src/ChangeLog
index 1aa79a1c674f0635393617688005814a4d4b4042..cb8b1f1f3ab88552e43cf7ed127697351ff6196d 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -5,6 +5,8 @@
         (digest_single_submenu): Remove.
         (syms_of_w32menu): Don't initialise variables that have moved
         to menu.c.
+        (set_frame_menubar): Sync with version in xmenu.c.
+        (w32_menu_show): Sync with xmenu_show in xmenu.c.
 
         * menu.c (single_keymap_panes, push_menu_pane, push_menu_item):
         Make static again.

diff --git a/src/xmenu.c b/src/xmenu.c
index 1573074316679268948324a2a47f65a7da129f33..bba202e4504acf64f11499605f36055311022c7e 100644 (file)
--- a/src/xmenu.c
+++ b/src/xmenu.c
@@ -2114,8 +2114,8 @@ xmenu_show (f, x, y, for_click, keymaps, title, error)
       wv_title->name = (char *) SDATA (title);
       wv_title->enabled = TRUE;
       wv_title->button_type = BUTTON_TYPE_NONE;
-      wv_title->next = wv_sep1;
       wv_title->help = Qnil;
+      wv_title->next = wv_sep1;
       first_wv->contents = wv_title;
     }