From: Po Lu <luangruo@yahoo.com>
Date: Tue, 12 Apr 2022 13:15:05 +0000 (+0800)
Subject: Fix detection of Meta key in some cases
X-Git-Tag: emacs-29.0.90~1931^2~630
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=1b20c4eaa2e5befc4c500637332c3bc1b719cf47;p=emacs.git

Fix detection of Meta key in some cases

* src/xterm.c (x_find_modifier_meanings): Set found_meta_p
correctly.
---

diff --git a/src/xterm.c b/src/xterm.c
index 12707fc9a20..e922ab8fbb2 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -9883,6 +9883,7 @@ x_find_modifier_meanings (struct x_display_info *dpyinfo)
 #ifdef HAVE_XKB
   int i;
   int found_meta_p = false;
+  uint vmodmask;
 #endif
 
   dpyinfo->meta_mod_mask = 0;
@@ -9897,12 +9898,14 @@ x_find_modifier_meanings (struct x_display_info *dpyinfo)
     {
       for (i = 0; i < XkbNumVirtualMods; i++)
 	{
-	  uint vmodmask = dpyinfo->xkb_desc->server->vmods[i];
+	  vmodmask = dpyinfo->xkb_desc->server->vmods[i];
 
 	  if (dpyinfo->xkb_desc->names->vmods[i] == dpyinfo->Xatom_Meta)
 	    {
 	      dpyinfo->meta_mod_mask |= vmodmask;
-	      found_meta_p = vmodmask;
+
+	      if (vmodmask)
+		found_meta_p = true;
 	    }
 	  else if (dpyinfo->xkb_desc->names->vmods[i] == dpyinfo->Xatom_Alt)
 	    dpyinfo->alt_mod_mask |= vmodmask;