[Emacs-diffs] Changes to emacs/src/xmenu.c

[Kim F . Storm]

Index: emacs/src/xmenu.c
diff -c emacs/src/xmenu.c:1.266 emacs/src/xmenu.c:1.267
*** emacs/src/xmenu.c:1.266     Fri Nov 12 10:34:36 2004
--- emacs/src/xmenu.c   Fri Nov 12 13:46:39 2004
***************
*** 524,530 ****
      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
--- 524,530 ----
      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,1104 ****
           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.  */
--- 1098,1104 ----
           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,1183 ****
--- 1178,1184 ----
       int dummy;
  {
    popup_activated_flag = 0;
+   return Qnil;
  }
  
  /* Loop in Xt until the menu pulldown or dialog popup has been
***************
*** 1272,1277 ****
--- 1273,1279 ----
        current_menu = 0;
        popup_activated_flag = 0;
      }
+   return Qnil;
  }
  
  static void
***************
*** 2417,2423 ****
    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;
  
--- 2419,2425 ----
    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;