aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorPo Lu2022-01-16 13:46:39 +0800
committerPo Lu2022-01-16 13:46:39 +0800
commite2b9f3347e7f30e7185c5d07bc722ea0178f4dbe (patch)
treea133bca8f58a3e96cf6195cdfac1e710cb8a21e8 /src
parentc59e870cceb2f40040d6c02da7658c58054ab3ad (diff)
downloademacs-e2b9f3347e7f30e7185c5d07bc722ea0178f4dbe.tar.gz
emacs-e2b9f3347e7f30e7185c5d07bc722ea0178f4dbe.zip
Update modifier meanings even if an xkb_desc was not available
* src/xterm.c (handle_one_event): Always update modifiers after the keyboard mapping is refreshed.
Diffstat (limited to 'src')
-rw-r--r--src/xterm.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/xterm.c b/src/xterm.c
index 5798ea3eebc..4b5358ed658 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -11526,8 +11526,6 @@ handle_one_xevent (struct x_display_info *dpyinfo,
11526 XkbFreeKeyboard (dpyinfo->xkb_desc, XkbAllComponentsMask, True); 11526 XkbFreeKeyboard (dpyinfo->xkb_desc, XkbAllComponentsMask, True);
11527 dpyinfo->xkb_desc = NULL; 11527 dpyinfo->xkb_desc = NULL;
11528 } 11528 }
11529
11530 x_find_modifier_meanings (dpyinfo);
11531 } 11529 }
11532 else 11530 else
11533 { 11531 {
@@ -11545,6 +11543,7 @@ handle_one_xevent (struct x_display_info *dpyinfo,
11545 } 11543 }
11546 11544
11547 XkbRefreshKeyboardMapping (&xkbevent->map); 11545 XkbRefreshKeyboardMapping (&xkbevent->map);
11546 x_find_modifier_meanings (dpyinfo);
11548 } 11547 }
11549 } 11548 }
11550#endif 11549#endif