aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorKenichi Handa2006-05-09 13:20:25 +0000
committerKenichi Handa2006-05-09 13:20:25 +0000
commit5f2c7b2a65b942b6c9bbd290c932c956f31f9524 (patch)
treee7f639ec19b2f80b1dc536f4b15b04b8a85ab350 /src
parentf39a0b4301f5c1c5902b35ae9eb2f9f051da4bf0 (diff)
downloademacs-5f2c7b2a65b942b6c9bbd290c932c956f31f9524.tar.gz
emacs-5f2c7b2a65b942b6c9bbd290c932c956f31f9524.zip
(push_key_description): Fix previous change.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog4
-rw-r--r--src/keymap.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 9ae27eadf12..89147db983f 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
12006-05-09 Kenichi Handa <handa@m17n.org>
2
3 * keymap.c (push_key_description): Handle invalid character key.
4
12006-05-08 Kenichi Handa <handa@m17n.org> 52006-05-08 Kenichi Handa <handa@m17n.org>
2 6
3 * callproc.c (Fcall_process): Use system_eol_type for encoding 7 * callproc.c (Fcall_process): Use system_eol_type for encoding
diff --git a/src/keymap.c b/src/keymap.c
index a9669780830..c8158a3a691 100644
--- a/src/keymap.c
+++ b/src/keymap.c
@@ -2097,7 +2097,7 @@ push_key_description (c, p, force_multibyte)
2097 c2 = c & ~(alt_modifier | ctrl_modifier | hyper_modifier 2097 c2 = c & ~(alt_modifier | ctrl_modifier | hyper_modifier
2098 | meta_modifier | shift_modifier | super_modifier); 2098 | meta_modifier | shift_modifier | super_modifier);
2099 2099
2100 valid_p = SINGLE_BYTE_CHAR_P (c) || char_valid_p (c, 0); 2100 valid_p = SINGLE_BYTE_CHAR_P (c2) || char_valid_p (c2, 0);
2101 if (! valid_p) 2101 if (! valid_p)
2102 { 2102 {
2103 /* KEY_DESCRIPTION_SIZE is large enough for this. */ 2103 /* KEY_DESCRIPTION_SIZE is large enough for this. */