1 files changed, 7 insertions, 0 deletions

diff --git a/src/xterm.c b/src/xterm.c
index 91622d7f27d..d558f394b3e 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -1505,6 +1505,13 @@ x_find_modifier_meanings ()
       x_alt_mod_mask = 0;
     }
 
+  /* If some keys are both alt and meta,
+     make them just meta, not alt.  */
+  if (x_alt_mod_mask & x_meta_mod_mask)
+    {
+      x_alt_mod_mask &= ~x_meta_mod_mask;
+    }
+  
   XFree ((char *) syms);
   XFreeModifiermap (mods);
 }