]> git.eshelyaron.com Git - emacs.git/commitdiff
Update modifier meanings even if an xkb_desc was not available
authorPo Lu <luangruo@yahoo.com>
Sun, 16 Jan 2022 05:46:39 +0000 (13:46 +0800)
committerPo Lu <luangruo@yahoo.com>
Sun, 16 Jan 2022 05:46:39 +0000 (13:46 +0800)
* src/xterm.c (handle_one_event): Always update modifiers after
the keyboard mapping is refreshed.

src/xterm.c

index 5798ea3eebc9618f2c9e3362d106e29387b10ca4..4b5358ed658dc87d160c25decd593411f3ea8a0e 100644 (file)
@@ -11526,8 +11526,6 @@ handle_one_xevent (struct x_display_info *dpyinfo,
                      XkbFreeKeyboard (dpyinfo->xkb_desc, XkbAllComponentsMask, True);
                      dpyinfo->xkb_desc = NULL;
                    }
-
-                 x_find_modifier_meanings (dpyinfo);
                }
              else
                {
@@ -11545,6 +11543,7 @@ handle_one_xevent (struct x_display_info *dpyinfo,
                }
 
              XkbRefreshKeyboardMapping (&xkbevent->map);
+             x_find_modifier_meanings (dpyinfo);
            }
        }
 #endif