diff options
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/menu.c | 6 |
2 files changed, 7 insertions, 3 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index f5495f59220..63dc2fbd007 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,6 +1,10 @@ 2008-06-09 Jason Rumney <jasonr@gnu.org> * w32menu.c (Fx_popup_menu): Unwind protect while building menu. + (parse_single_submenu): Remove. + + * menu.c (single_keymap_panes, push_menu_pane, push_menu_item): + Make static again. 2008-06-09 Jason Rumney <jasonr@gnu.org> diff --git a/src/menu.c b/src/menu.c index 7554f2a99c1..52c721891f7 100644 --- a/src/menu.c +++ b/src/menu.c @@ -204,7 +204,7 @@ push_left_right_boundary () /* Start a new menu pane in menu_items. NAME is the pane name. PREFIX_VEC is a prefix key for this pane. */ -void +static void push_menu_pane (name, prefix_vec) Lisp_Object name, prefix_vec; { @@ -226,7 +226,7 @@ push_menu_pane (name, prefix_vec) for this item (or nil if none). TYPE is the type of this menu item, one of nil, `toggle' or `radio'. */ -void +static void push_menu_item (name, enable, key, def, equiv, type, selected, help) Lisp_Object name, enable, key, def, equiv, type, selected, help; { @@ -263,7 +263,7 @@ static void single_menu_item P_ ((Lisp_Object, Lisp_Object, Lisp_Object, If we encounter submenus deeper than MAXDEPTH levels, ignore them. */ -void +static void single_keymap_panes (keymap, pane_name, prefix, notreal, maxdepth) Lisp_Object keymap; Lisp_Object pane_name; |