aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAndreas Schwab2012-07-30 09:45:58 +0200
committerAndreas Schwab2012-07-30 09:45:58 +0200
commit169304bdb3445a2d8212bed42ba77e2081e9585a (patch)
tree15c10e5c3966cb81b23e29319bd758e1e4041f53 /src
parent6cd7a13902729007a4d1e14a299bad47c9808353 (diff)
downloademacs-169304bdb3445a2d8212bed42ba77e2081e9585a.tar.gz
emacs-169304bdb3445a2d8212bed42ba77e2081e9585a.zip
Fixes: debbugs:12090
* keymap.c (Fkey_description): Don't remove 0x80 bit from non-single-byte char when adding meta modifier.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog5
-rw-r--r--src/keymap.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 41d7759cfb5..e8aff22c2cb 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
12012-07-30 Andreas Schwab <schwab@linux-m68k.org>
2
3 * keymap.c (Fkey_description): Don't remove 0x80 bit from
4 non-single-byte char when adding meta modifier. (Bug#12090)
5
12012-07-30 Dmitry Antipov <dmantipov@yandex.ru> 62012-07-30 Dmitry Antipov <dmantipov@yandex.ru>
2 7
3 Convert safe_call to use variable number of arguments. 8 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. */)
2141 continue; 2141 continue;
2142 } 2142 }
2143 else 2143 else
2144 XSETINT (key, (XINT (key) | meta_modifier) & ~0x80); 2144 XSETINT (key, XINT (key) | meta_modifier);
2145 add_meta = 0; 2145 add_meta = 0;
2146 } 2146 }
2147 else if (EQ (key, meta_prefix_char)) 2147 else if (EQ (key, meta_prefix_char))