aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAndreas Schwab2008-03-16 11:24:35 +0000
committerAndreas Schwab2008-03-16 11:24:35 +0000
commita864f6d690ff51e210ac11cd2e487ebba7dbb1c4 (patch)
treeb4360bb2fc3cf773ddd251822ac7bedf481ac586 /src
parentf50201817b3729dda94ce7bd0f7e2cb5371d0340 (diff)
downloademacs-a864f6d690ff51e210ac11cd2e487ebba7dbb1c4.tar.gz
emacs-a864f6d690ff51e210ac11cd2e487ebba7dbb1c4.zip
(read_key_sequence): Fix downcasing of letters with
modifiers.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog3
-rw-r--r--src/keyboard.c2
2 files changed, 4 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 2b7e7f8e3c3..57e5d831189 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,8 @@
12008-03-16 Andreas Schwab <schwab@suse.de> 12008-03-16 Andreas Schwab <schwab@suse.de>
2 2
3 * keyboard.c (read_key_sequence): Fix downcasing of letters with
4 modifiers.
5
3 * regex.c (re_match_2_internal): Correct matching of a charset 6 * regex.c (re_match_2_internal): Correct matching of a charset
4 against latin-1 characters. 7 against latin-1 characters.
5 8
diff --git a/src/keyboard.c b/src/keyboard.c
index 2acf6aaa3cc..16b9006b15f 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -10105,7 +10105,7 @@ read_key_sequence (keybuf, bufsize, prompt, dont_downcase_last,
10105 XSETINT (new_key, XINT (key) & ~shift_modifier); 10105 XSETINT (new_key, XINT (key) & ~shift_modifier);
10106 else 10106 else
10107 XSETINT (new_key, (DOWNCASE (XINT (key) & ~CHAR_MODIFIER_MASK) 10107 XSETINT (new_key, (DOWNCASE (XINT (key) & ~CHAR_MODIFIER_MASK)
10108 | (XINT (key) & ~CHAR_MODIFIER_MASK))); 10108 | (XINT (key) & CHAR_MODIFIER_MASK)));
10109 10109
10110 /* We have to do this unconditionally, regardless of whether 10110 /* We have to do this unconditionally, regardless of whether
10111 the lower-case char is defined in the keymaps, because they 10111 the lower-case char is defined in the keymaps, because they