From: Po Lu <luangruo@yahoo.com>
Date: Sun, 16 Jan 2022 05:46:39 +0000 (+0800)
Subject: Update modifier meanings even if an xkb_desc was not available
X-Git-Tag: emacs-29.0.90~3020
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=e2b9f3347e7f30e7185c5d07bc722ea0178f4dbe;p=emacs.git

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

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