From: Andreas Schwab <schwab@linux-m68k.org>
Date: Mon, 30 Jul 2012 07:45:58 +0000 (+0200)
Subject: Fixes: debbugs:12090
X-Git-Tag: emacs-24.2.90~998
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=169304bdb3445a2d8212bed42ba77e2081e9585a;p=emacs.git

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 41d7759cfb5..e8aff22c2cb 100644
--- 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 6cc76700542..3c5d45b0680 100644
--- 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))