From a9d8395f86de41ac26a313dd5b7c8bc8356458eb Mon Sep 17 00:00:00 2001 From: Jason Rumney Date: Mon, 9 Jun 2008 23:05:10 +0000 Subject: [PATCH] (set_frame_menubar): Sync with version in xmenu.c. (w32_menu_show): Sync with xmenu_show in xmenu.c. --- src/ChangeLog | 2 ++ src/xmenu.c | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/ChangeLog b/src/ChangeLog index 1aa79a1c674..cb8b1f1f3ab 100644 --- 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 15730743166..bba202e4504 100644 --- 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; } -- 2.39.2