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

[Jan Djärv]

Index: emacs/src/xmenu.c
diff -c emacs/src/xmenu.c:1.276 emacs/src/xmenu.c:1.277
*** emacs/src/xmenu.c:1.276     Mon Dec 27 20:34:03 2004
--- emacs/src/xmenu.c   Mon Dec 27 20:56:56 2004
***************
*** 116,122 ****
  
  static Lisp_Object xdialog_show P_ ((FRAME_PTR, int, Lisp_Object, char **));
  static void popup_get_selection P_ ((XEvent *, struct x_display_info *,
!                                      LWLIB_ID, int, int));
  
  /* Define HAVE_BOXES if menus can handle radio and toggle buttons.  */
  
--- 116,122 ----
  
  static Lisp_Object xdialog_show P_ ((FRAME_PTR, int, Lisp_Object, char **));
  static void popup_get_selection P_ ((XEvent *, struct x_display_info *,
!                                      LWLIB_ID, int));
  
  /* Define HAVE_BOXES if menus can handle radio and toggle buttons.  */
  
***************
*** 1186,1203 ****
     popped down (deactivated).  This is used for x-popup-menu
     and x-popup-dialog; it is not used for the menu bar.
  
-    If DOWN_ON_KEYPRESS is nonzero, pop down if a key is pressed.
- 
     NOTE: All calls to popup_get_selection should be protected
     with BLOCK_INPUT, UNBLOCK_INPUT wrappers.  */
  
  static void
! popup_get_selection (initial_event, dpyinfo, id, do_timers, down_on_keypress)
       XEvent *initial_event;
       struct x_display_info *dpyinfo;
       LWLIB_ID id;
       int do_timers;
-      int down_on_keypress;
  {
    XEvent event;
  
--- 1186,1200 ----
     popped down (deactivated).  This is used for x-popup-menu
     and x-popup-dialog; it is not used for the menu bar.
  
     NOTE: All calls to popup_get_selection should be protected
     with BLOCK_INPUT, UNBLOCK_INPUT wrappers.  */
  
  static void
! popup_get_selection (initial_event, dpyinfo, id, do_timers)
       XEvent *initial_event;
       struct x_display_info *dpyinfo;
       LWLIB_ID id;
       int do_timers;
  {
    XEvent event;
  
***************
*** 1234,1240 ****
          }
        /* Pop down on C-g and Escape.  */
        else if (event.type == KeyPress
-                && down_on_keypress
                 && dpyinfo->display == event.xbutton.display)
          {
            KeySym keysym = XLookupKeysym (&event.xkey, 0);
--- 1231,1236 ----
***************
*** 2599,2605 ****
                                    make_number (menu_id & ~(-1 << (fact)))));
  
      /* Process events that apply to the menu.  */
!     popup_get_selection ((XEvent *) 0, FRAME_X_DISPLAY_INFO (f), menu_id, 1, 
0);
  
      unbind_to (specpdl_count, Qnil);
    }
--- 2595,2601 ----
                                    make_number (menu_id & ~(-1 << (fact)))));
  
      /* Process events that apply to the menu.  */
!     popup_get_selection ((XEvent *) 0, FRAME_X_DISPLAY_INFO (f), menu_id, 1);
  
      unbind_to (specpdl_count, Qnil);
    }
***************
*** 2977,2983 ****
                                    make_number (dialog_id & ~(-1 << (fact)))));
  
      popup_get_selection ((XEvent *) 0, FRAME_X_DISPLAY_INFO (f),
!                          dialog_id, 1, 1);
  
      unbind_to (count, Qnil);
    }
--- 2973,2979 ----
                                    make_number (dialog_id & ~(-1 << (fact)))));
  
      popup_get_selection ((XEvent *) 0, FRAME_X_DISPLAY_INFO (f),
!                          dialog_id, 1);
  
      unbind_to (count, Qnil);
    }