From: Po Lu <luangruo@yahoo.com>
Date: Sat, 26 Aug 2023 10:12:24 +0000 (+0800)
Subject: Repair bug#65068 on Emacs 29
X-Git-Tag: emacs-29.1.90~177
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=a6cb8e3a1fa;p=emacs.git

Repair bug#65068 on Emacs 29

* src/xterm.c (x_term_init): Disable ControlFallback library
control wherever present.  (bug#65068)

Do not merge to master.
---

diff --git a/src/xterm.c b/src/xterm.c
index 5840b15bcb7..709705fc19e 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -30178,6 +30178,16 @@ x_term_init (Lisp_Object display_name, char *xrm_option, char *resource_name)
 		       XkbNewKeyboardNotifyMask | XkbMapNotifyMask,
 		       XkbNewKeyboardNotifyMask | XkbMapNotifyMask);
     }
+
+  /* XFree86 extends XKBlib with a new Xlib control `ControlFallback',
+     which enables a search for symbols designating ASCII characters
+     within inactive groups during keycode translation when
+     ControlMask is set.  Users find this behavior gratuitous, so
+     disable it if present.  */
+
+#ifdef XkbLC_ControlFallback
+  XkbSetXlibControls (dpyinfo->display, XkbLC_ControlFallback, 0);
+#endif /* XkbLC_ControlFallback */
 #endif
 
 #ifdef HAVE_XFIXES