]> git.eshelyaron.com Git - emacs.git/commitdiff
Wait for events from all displays in Xm dialogs even on XI2
authorPo Lu <luangruo@yahoo.com>
Mon, 2 May 2022 12:16:53 +0000 (20:16 +0800)
committerPo Lu <luangruo@yahoo.com>
Mon, 2 May 2022 12:18:21 +0000 (20:18 +0800)
* src/xfns.c (Fx_file_dialog): Always process events from all
displays.

src/xfns.c

index 27bca5523cc69cefdbd76c1b6e1a545c1f7c2a5a..7176d626094734950a34902cad71f91e3f633681 100644 (file)
@@ -8787,25 +8787,11 @@ DEFUN ("x-file-dialog", Fx_file_dialog, Sx_file_dialog, 2, 5, 0,
   while (result == 0)
     {
       XEvent event, copy;
-#ifdef HAVE_XINPUT2
-      x_menu_wait_for_event (FRAME_X_DISPLAY (f));
-#else
       x_menu_wait_for_event (0);
-#endif
 
-      if (
-#ifndef HAVE_XINPUT2
-         XtAppPending (Xt_app_con)
-#else
-         XPending (FRAME_X_DISPLAY (f))
-#endif
-         )
+      if (XtAppPending (Xt_app_con))
        {
-#ifndef HAVE_XINPUT2
          XtAppNextEvent (Xt_app_con, &event);
-#else
-         XNextEvent (FRAME_X_DISPLAY (f), &event);
-#endif
 
          copy = event;
          if (event.type == KeyPress