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

[Jan Djärv]

Index: emacs/src/xmenu.c
diff -c emacs/src/xmenu.c:1.277 emacs/src/xmenu.c:1.278
*** emacs/src/xmenu.c:1.277     Mon Dec 27 20:56:56 2004
--- emacs/src/xmenu.c   Fri Jan  7 20:50:46 2005
***************
*** 2454,2463 ****
                             G_CALLBACK (menu_highlight_callback));
    xg_crazy_callback_abort = 0;
  
-   for (i = 0; i < 5; i++)
-     if (FRAME_X_DISPLAY_INFO (f)->grabbed & (1 << i))
-       break;
- 
    if (! for_click)
      {
        /* Not invoked by a click.  pop up at x/y.  */
--- 2454,2459 ----
***************
*** 2470,2477 ****
        popup_x_y.x = x;
        popup_x_y.y = y;
        popup_x_y.f = f;
-     }
  
    /* Display the menu.  */
    gtk_widget_show_all (menu);
    gtk_menu_popup (GTK_MENU (menu), 0, 0, pos_func, &popup_x_y, i, 0);
--- 2466,2481 ----
        popup_x_y.x = x;
        popup_x_y.y = y;
        popup_x_y.f = f;
  
+       i = 0;  /* gtk_menu_popup needs this to be 0 for a non-button popup.  */
+     }
+   else
+     {
+       for (i = 0; i < 5; i++)
+         if (FRAME_X_DISPLAY_INFO (f)->grabbed & (1 << i))
+           break;
+     }
+   
    /* Display the menu.  */
    gtk_widget_show_all (menu);
    gtk_menu_popup (GTK_MENU (menu), 0, 0, pos_func, &popup_x_y, i, 0);