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

[Thien-Thi Nguyen]

Index: emacs/src/xmenu.c
diff -c emacs/src/xmenu.c:1.283 emacs/src/xmenu.c:1.284
*** emacs/src/xmenu.c:1.283     Thu Mar 24 18:53:43 2005
--- emacs/src/xmenu.c   Mon Apr 18 09:36:06 2005
***************
*** 2483,2489 ****
          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);
--- 2483,2489 ----
          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);
***************
*** 2601,2607 ****
    /* Display the menu.  */
    lw_popup_menu (menu, (XEvent *) &dummy);
    popup_activated_flag = 1;
!   
    {
      int fact = 4 * sizeof (LWLIB_ID);
      int specpdl_count = SPECPDL_INDEX ();
--- 2601,2607 ----
    /* Display the menu.  */
    lw_popup_menu (menu, (XEvent *) &dummy);
    popup_activated_flag = 1;
! 
    {
      int fact = 4 * sizeof (LWLIB_ID);
      int specpdl_count = SPECPDL_INDEX ();
***************
*** 3225,3231 ****
  {
    struct Lisp_Save_Value *p1 = XSAVE_VALUE (Fcar (arg));
    struct Lisp_Save_Value *p2 = XSAVE_VALUE (Fcdr (arg));
!   
    FRAME_PTR f = p1->pointer;
    XMenu *menu = p2->pointer;
  
--- 3225,3231 ----
  {
    struct Lisp_Save_Value *p1 = XSAVE_VALUE (Fcar (arg));
    struct Lisp_Save_Value *p2 = XSAVE_VALUE (Fcdr (arg));
! 
    FRAME_PTR f = p1->pointer;
    XMenu *menu = p2->pointer;
  
***************
*** 3459,3465 ****
  #ifndef MSDOS
    XMenuActivateSetWaitFunction (x_menu_wait_for_event, FRAME_X_DISPLAY (f));
  #endif
!   
    record_unwind_protect (pop_down_menu,
                           Fcons (make_save_value (f, 0),
                                  make_save_value (menu, 0)));
--- 3459,3465 ----
  #ifndef MSDOS
    XMenuActivateSetWaitFunction (x_menu_wait_for_event, FRAME_X_DISPLAY (f));
  #endif
! 
    record_unwind_protect (pop_down_menu,
                           Fcons (make_save_value (f, 0),
                                  make_save_value (menu, 0)));