From: Po Lu <luangruo@yahoo.com>
Date: Tue, 5 Jul 2022 02:12:19 +0000 (+0800)
Subject: Don't overestimate supported input extension version on GTK 3
X-Git-Tag: emacs-29.0.90~1447^2~1186
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=08df1631b4f0a71ef988d31c5792978fb3e587dc;p=emacs.git

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.
---

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)
 	}
       else
 	x_uncatch_errors_after_check ();
+
+      /* But don't delude ourselves into thinking that we can use
+	 features provided by a version of the input extension that
+	 libXi itself doesn't support.  */
+
+      if (minor > original_minor)
+	minor = original_minor;
 #else
       if (x_had_errors_p (dpyinfo->display))
 	rc = BadRequest;