procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* src/xterm.c (x_term_init): Catch some errors from defective X servers.

Browse source
This commit is contained in:
Po Lu 2022-02-23 18:11:29 +08:00
parent 304c373c98
commit 4f53789a0a
1 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/xterm.c
View file

@ -16414,9 +16414,10 @@ x_term_init (Lisp_Object display_name, char *xrm_option, char *resource_name)
request results in an error. If that doesn't work, however,
then it's the latter, so decrease the minor until the version
that GTK requested is found. */
x_catch_errors (dpyinfo->display);
#endif
x_catch_errors (dpyinfo->display);
rc = XIQueryVersion (dpyinfo->display, &major, &minor);
#ifdef HAVE_GTK3
@ -16460,6 +16461,11 @@ x_term_init (Lisp_Object display_name, char *xrm_option, char *resource_name)
}
else
x_uncatch_errors_after_check ();
#else
if (x_had_errors_p (dpyinfo->display))
rc = BadRequest;
x_uncatch_errors_after_check ();
#endif
if (rc == Success)
@ -16468,6 +16474,7 @@ x_term_init (Lisp_Object display_name, char *xrm_option, char *resource_name)
x_init_master_valuators (dpyinfo);
}
}
dpyinfo->xi2_version = minor;
#endif