(pop_down_menu): Return nil.

diff --git a/src/ChangeLog b/src/ChangeLog
index 89002eaadd11d3c1d32046452403e24bddaafab8..43283cc83e31214e3d86c762e7b0b908f1528334 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2004-11-12  Kim F. Storm  <storm@cua.dk>
+
+       * xmenu.c (pop_down_menu): Return nil.
+
 2004-11-12  Jan Dj\e,Ad\e(Brv  <jan.h.d@swipnet.se>
 
        * xmenu.c (x_menu_wait_for_event): New function.
@@ -8,7 +12,7 @@
        do_timers to popup_widget_loop.
        (xmenu_show): Call XMenuActivateSetWaitFunction so that
        x_menu_wait_for_event is called by XMenuActivate.
-       (create_and_show_popup_menu): Pass 1 for do_timers to 
+       (create_and_show_popup_menu): Pass 1 for do_timers to
        popup_get_selection.
        (pop_down_menu): New function.
        (popup_get_selection, popup_widget_loop): Unwind protect to

diff --git a/src/xmenu.c b/src/xmenu.c
index d7551cd7e45bcd5cb56dfb029de3bc584263cdea..3b81392728132ccf5b5ac47828be46d995cda9b5 100644 (file)
--- a/src/xmenu.c
+++ b/src/xmenu.c
@@ -524,7 +524,7 @@ single_menu_item (key, item, dummy, skp_v)
     return;                    /* Not a menu item.  */
 
   map = XVECTOR (item_properties)->contents[ITEM_PROPERTY_MAP];
-  
+
   if (skp->notreal)
     {
       /* We don't want to make a menu, just traverse the keymaps to
@@ -1098,7 +1098,7 @@ on the left of the dialog box and all following items on the right.
          the dialog.  Also, the lesstif/motif version crashes if there are
          no buttons.  */
       contents = Fcons (title, Fcons (Fcons (build_string ("Ok"), Qt), Qnil));
-    
+
     list_of_panes (Fcons (contents, Qnil));
 
     /* Display them in a dialog box.  */
@@ -1178,6 +1178,7 @@ pop_down_menu (dummy)
      int dummy;
 {
   popup_activated_flag = 0;
+  return Qnil;
 }
 
 /* Loop in Xt until the menu pulldown or dialog popup has been
@@ -1272,6 +1273,7 @@ pop_down_menu (dummy)
       current_menu = 0;
       popup_activated_flag = 0;
     }
+  return Qnil;
 }
 
 static void
@@ -2417,7 +2419,7 @@ menu_position_func (menu, x, y, push_in, user_data)
   GtkRequisition req;
   int disp_width = FRAME_X_DISPLAY_INFO (data->f)->width;
   int disp_height = FRAME_X_DISPLAY_INFO (data->f)->height;
-  
+
   *x = data->x;
   *y = data->y;