diff options
| author | Po Lu | 2022-07-05 10:12:19 +0800 |
|---|---|---|
| committer | Po Lu | 2022-07-05 10:13:37 +0800 |
| commit | 08df1631b4f0a71ef988d31c5792978fb3e587dc (patch) | |
| tree | 6094c277caa78c29949daa0ef553468e7e18eb16 /src | |
| parent | f1ae277e0bbb5e03bb24ff79b4544e5b12f2d361 (diff) | |
| download | emacs-08df1631b4f0a71ef988d31c5792978fb3e587dc.tar.gz emacs-08df1631b4f0a71ef988d31c5792978fb3e587dc.zip | |
Don't overestimate supported input extension version on GTK 3
* src/xterm.c (x_term_init): If minor > original_minor (the
maximum version supported by libXi), set it back to
original_minor.
Diffstat (limited to 'src')
| -rw-r--r-- | src/xterm.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/xterm.c b/src/xterm.c index 82a20ad1a97..7843a46ab25 100644 --- a/src/xterm.c +++ b/src/xterm.c | |||
| @@ -27099,6 +27099,13 @@ x_term_init (Lisp_Object display_name, char *xrm_option, char *resource_name) | |||
| 27099 | } | 27099 | } |
| 27100 | else | 27100 | else |
| 27101 | x_uncatch_errors_after_check (); | 27101 | x_uncatch_errors_after_check (); |
| 27102 | |||
| 27103 | /* But don't delude ourselves into thinking that we can use | ||
| 27104 | features provided by a version of the input extension that | ||
| 27105 | libXi itself doesn't support. */ | ||
| 27106 | |||
| 27107 | if (minor > original_minor) | ||
| 27108 | minor = original_minor; | ||
| 27102 | #else | 27109 | #else |
| 27103 | if (x_had_errors_p (dpyinfo->display)) | 27110 | if (x_had_errors_p (dpyinfo->display)) |
| 27104 | rc = BadRequest; | 27111 | rc = BadRequest; |