Mercurial > emacs
changeset 57965:9b14127a651a
* eval.c (Feval): Remove check for INPUT_BLOCKED_P.
* xmenu.c (popup_get_selection, create_and_show_popup_menu)
(create_and_show_dialog): Revert change from 2004-10-31.
| author | Jan Djärv <jan.h.d@swipnet.se> |
|---|---|
| date | Sat, 06 Nov 2004 07:47:27 +0000 |
| parents | 05c49cd7076a |
| children | 13661731eef0 |
| files | src/ChangeLog src/eval.c src/xmenu.c |
| diffstat | 3 files changed, 22 insertions(+), 11 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Fri Nov 05 23:41:56 2004 +0000 +++ b/src/ChangeLog Sat Nov 06 07:47:27 2004 +0000 @@ -1,3 +1,11 @@ +2004-11-06 Jan Dj,Ad(Brv <jan.h.d@swipnet.se> + + * eval.c (Feval): Remove check for INPUT_BLOCKED_P. + + * xmenu.c (popup_get_selection, create_and_show_popup_menu) + (create_and_show_dialog): Revert change from 2004-10-31. + + 2004-11-05 Luc Teirlinck <teirllm@auburn.edu> * macros.c (syms_of_macros) <defining-kbd-macro>: Doc fix.
--- a/src/eval.c Fri Nov 05 23:41:56 2004 +0000 +++ b/src/eval.c Sat Nov 06 07:47:27 2004 +0000 @@ -1996,7 +1996,7 @@ struct backtrace backtrace; struct gcpro gcpro1, gcpro2, gcpro3; - if (handling_signal || INPUT_BLOCKED_P) + if (handling_signal) abort (); if (SYMBOLP (form))
--- a/src/xmenu.c Fri Nov 05 23:41:56 2004 +0000 +++ b/src/xmenu.c Sat Nov 06 07:47:27 2004 +0000 @@ -115,7 +115,7 @@ 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)); + LWLIB_ID, int, int)); /* Define HAVE_BOXES if menus can handle radio and toggle buttons. */ @@ -157,6 +157,8 @@ static void list_of_panes P_ ((Lisp_Object)); static void list_of_items P_ ((Lisp_Object)); +extern EMACS_TIME timer_check P_ ((int)); + /* This holds a Lisp vector that holds the results of decoding the keymaps or alist-of-alists that specify a menu. @@ -1122,27 +1124,27 @@ If DOWN_ON_KEYPRESS is nonzero, pop down if a key is pressed. - This function used to have a DO_TIMERS argument which was - 1 in the dialog case, and caused it to run Lisp-level timers. - That was unsafe so we removed it, but does anyone remember - why menus and dialogs were treated differently? - NOTE: All calls to popup_get_selection should be protected with BLOCK_INPUT, UNBLOCK_INPUT wrappers. */ #ifdef USE_X_TOOLKIT static void -popup_get_selection (initial_event, dpyinfo, id, down_on_keypress) +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; while (popup_activated_flag) { - if (initial_event) + /* If we have no events to run, consider timers. */ + if (do_timers && !XtAppPending (Xt_app_con)) + timer_check (1); + + if (initial_event) { event = *initial_event; initial_event = 0; @@ -2488,7 +2490,7 @@ popup_activated_flag = 1; /* Process events that apply to the menu. */ - popup_get_selection ((XEvent *) 0, FRAME_X_DISPLAY_INFO (f), menu_id, 0); + popup_get_selection ((XEvent *) 0, FRAME_X_DISPLAY_INFO (f), menu_id, 0, 0); /* fp turned off the following statement and wrote a comment that it is unnecessary--that the menu has already disappeared. @@ -2882,7 +2884,8 @@ Fcons (make_number (dialog_id >> (fact)), make_number (dialog_id & ~(-1 << (fact))))); - popup_get_selection ((XEvent *) 0, FRAME_X_DISPLAY_INFO (f), dialog_id, 1); + popup_get_selection ((XEvent *) 0, FRAME_X_DISPLAY_INFO (f), + dialog_id, 1, 1); unbind_to (count, Qnil); }