mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-26 07:00:35 -08:00
Code Issues Projects Releases Wiki Activity

Remove workaround for some input method problems

Browse source 
* src/xterm.c (handle_one_xevent): Remove modifier key
workaround for some input method problems, since they cause more
problems than they fix.  (bug#56782)
This commit is contained in:
Po Lu 2022-07-27 13:01:41 +08:00
parent 86f60ec54a
commit de863f70aa
1 changed files with 1 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

44
src/xterm.c
View file

@ -17756,7 +17756,7 @@ handle_one_xevent (struct x_display_info *dpyinfo,
/* `xkey' will be modified, but it's not important to modify
`event' itself. */
XKeyEvent xkey = event->xkey;
int i;
#ifdef HAVE_XINPUT2
Time pending_keystroke_time;
struct xi_device_t *source;
@ -17806,27 +17806,6 @@ handle_one_xevent (struct x_display_info *dpyinfo,
if (modifiers & dpyinfo->meta_mod_mask)
memset (&compose_status, 0, sizeof (compose_status));
#ifdef HAVE_XKB
if (dpyinfo->xkb_desc)
{
XkbDescRec *rec = dpyinfo->xkb_desc;
if (rec->map->modmap && rec->map->modmap[xkey.keycode])
goto done_keysym;
}
else
#endif
{
if (dpyinfo->modmap)
{
for (i = 0; i < 8 * dpyinfo->modmap->max_keypermod; i++)
{
if (xkey.keycode == dpyinfo->modmap->modifiermap[i])
goto done_keysym;
}
}
}
#ifdef HAVE_X_I18N
if (FRAME_XIC (f))
{
@ -21160,27 +21139,6 @@ handle_one_xevent (struct x_display_info *dpyinfo,
state |= x_emacs_to_x_modifiers (dpyinfo, extra_keyboard_modifiers);
#ifdef HAVE_XKB
if (dpyinfo->xkb_desc)
{
XkbDescRec *rec = dpyinfo->xkb_desc;
if (rec->map->modmap && rec->map->modmap[xev->detail])
goto xi_done_keysym;
}
else
#endif
{
if (dpyinfo->modmap)
{
for (i = 0; i < 8 * dpyinfo->modmap->max_keypermod; i++)
{
if (xev->detail == dpyinfo->modmap->modifiermap[i])
goto xi_done_keysym;
}
}
}
#ifdef HAVE_XKB
if (dpyinfo->xkb_desc)
{