diff options
| author | Jason Rumney | 2008-06-09 23:05:10 +0000 |
|---|---|---|
| committer | Jason Rumney | 2008-06-09 23:05:10 +0000 |
| commit | a9d8395f86de41ac26a313dd5b7c8bc8356458eb (patch) | |
| tree | ed1525777ba2e35ff2348b937db1967c9c7f7453 | |
| parent | 25be292e5f43dadef3e0cb00ddd126939e75ea35 (diff) | |
| download | emacs-a9d8395f86de41ac26a313dd5b7c8bc8356458eb.tar.gz emacs-a9d8395f86de41ac26a313dd5b7c8bc8356458eb.zip | |
(set_frame_menubar): Sync with version in xmenu.c.
(w32_menu_show): Sync with xmenu_show in xmenu.c.
| -rw-r--r-- | src/ChangeLog | 2 | ||||
| -rw-r--r-- | src/xmenu.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 1aa79a1c674..cb8b1f1f3ab 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -5,6 +5,8 @@ | |||
| 5 | (digest_single_submenu): Remove. | 5 | (digest_single_submenu): Remove. |
| 6 | (syms_of_w32menu): Don't initialise variables that have moved | 6 | (syms_of_w32menu): Don't initialise variables that have moved |
| 7 | to menu.c. | 7 | to menu.c. |
| 8 | (set_frame_menubar): Sync with version in xmenu.c. | ||
| 9 | (w32_menu_show): Sync with xmenu_show in xmenu.c. | ||
| 8 | 10 | ||
| 9 | * menu.c (single_keymap_panes, push_menu_pane, push_menu_item): | 11 | * menu.c (single_keymap_panes, push_menu_pane, push_menu_item): |
| 10 | Make static again. | 12 | 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) | |||
| 2114 | wv_title->name = (char *) SDATA (title); | 2114 | wv_title->name = (char *) SDATA (title); |
| 2115 | wv_title->enabled = TRUE; | 2115 | wv_title->enabled = TRUE; |
| 2116 | wv_title->button_type = BUTTON_TYPE_NONE; | 2116 | wv_title->button_type = BUTTON_TYPE_NONE; |
| 2117 | wv_title->next = wv_sep1; | ||
| 2118 | wv_title->help = Qnil; | 2117 | wv_title->help = Qnil; |
| 2118 | wv_title->next = wv_sep1; | ||
| 2119 | first_wv->contents = wv_title; | 2119 | first_wv->contents = wv_title; |
| 2120 | } | 2120 | } |
| 2121 | 2121 | ||