Fixes: debbugs:12090

* keymap.c (Fkey_description): Don't remove 0x80 bit from
non-single-byte char when adding meta modifier.

diff --git a/src/ChangeLog b/src/ChangeLog
index 41d7759cfb5107856024129afcc5a99b3759da3a..e8aff22c2cb3322c4232752082c0d0f60762c322 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2012-07-30  Andreas Schwab  <schwab@linux-m68k.org>
+
+       * keymap.c (Fkey_description): Don't remove 0x80 bit from
+       non-single-byte char when adding meta modifier.  (Bug#12090)
+
 2012-07-30  Dmitry Antipov  <dmantipov@yandex.ru>
 
        Convert safe_call to use variable number of arguments.

diff --git a/src/keymap.c b/src/keymap.c
index 6cc7670054260c68cfa544fe8c26d3b330786942..3c5d45b0680d93d1d34fa8b0ee362a7b9ead4402 100644 (file)
--- a/src/keymap.c
+++ b/src/keymap.c
@@ -2141,7 +2141,7 @@ The `kbd' macro is an approximate inverse of this.  */)
                continue;
            }
          else
-           XSETINT (key, (XINT (key) | meta_modifier) & ~0x80);
+           XSETINT (key, XINT (key) | meta_modifier);
          add_meta = 0;
        }
       else if (EQ (key, meta_prefix_char))