(single_keymap_panes, push_menu_pane, push_menu_item): Make static again.

diff --git a/src/ChangeLog b/src/ChangeLog
index f5495f59220c9ceb249a42023363b6a2eef26203..63dc2fbd0078db2f40440044cdf9871a44d4f98d 100644 (file)
--- 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 7554f2a99c1a0a79b32e33d4c29f2a896383c136..52c721891f7a6e728970002943d44009963dfe00 100644 (file)
--- 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;