1 files changed, 11 insertions, 1 deletions

diff --git a/src/xterm.c b/src/xterm.c
index 4ca1e131e67..2ac2fe84e52 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -9719,7 +9719,11 @@ get_bits_and_offset (unsigned long mask, int *bits, int *offset)
 bool
 x_display_ok (const char *display)
 {
-  Display *dpy = XOpenDisplay (display);
+  Display *dpy;
+  // XOpenDisplay fails if it gets a signal.  Block SIGIO which may arrive.
+  unrequest_sigio ();
+  dpy = XOpenDisplay (display);
+  request_sigio ();
   return dpy ? (XCloseDisplay (dpy), 1) : 0;
 }
 
@@ -9811,7 +9815,9 @@ x_term_init (Lisp_Object display_name, char *xrm_option, char *resource_name)
 
         /* gtk_init does set_locale.  Fix locale before and after.  */
         fixup_locale ();
+        unrequest_sigio (); // See comment in x_display_ok.
         gtk_init (&argc, &argv2);
+        request_sigio ();
         fixup_locale ();
 
         g_log_remove_handler ("GLib", id);
@@ -9861,10 +9867,12 @@ x_term_init (Lisp_Object display_name, char *xrm_option, char *resource_name)
         argv[argc++] = xrm_option;
       }
     turn_on_atimers (0);
+    unrequest_sigio ();  // See comment in x_display_ok.
     dpy = XtOpenDisplay (Xt_app_con, SSDATA (display_name),
                          resource_name, EMACS_CLASS,
                          emacs_options, XtNumber (emacs_options),
                          &argc, argv);
+    request_sigio ();
     turn_on_atimers (1);
 
 #ifdef HAVE_X11XTR6
@@ -9875,7 +9883,9 @@ x_term_init (Lisp_Object display_name, char *xrm_option, char *resource_name)
 
 #else /* not USE_X_TOOLKIT */
   XSetLocaleModifiers ("");
+  unrequest_sigio ();  // See comment in x_display_ok.
   dpy = XOpenDisplay (SSDATA (display_name));
+  request_sigio ();
 #endif /* not USE_X_TOOLKIT */
 #endif /* not USE_GTK*/