Commit d2187ebd authored by Jiri Bohac's avatar Jiri Bohac Committed by Linus Torvalds

console keyboard mapping broken by 04c71976

Several console keyboard maps are broken since

commit 04c71976
Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date:   Tue Oct 16 23:27:04 2007 -0700

    unicode diacritics support

because that changeset made k_self consider the value as a latin1
character when in Unicode mode, which is wrong; k_self should still take
the console map into account.
Signed-off-by: default avatarSamuel Thibault <samuel.thibault@ens-lyon.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 6c826818
...@@ -677,12 +677,7 @@ static void k_deadunicode(struct vc_data *vc, unsigned int value, char up_flag) ...@@ -677,12 +677,7 @@ static void k_deadunicode(struct vc_data *vc, unsigned int value, char up_flag)
static void k_self(struct vc_data *vc, unsigned char value, char up_flag) static void k_self(struct vc_data *vc, unsigned char value, char up_flag)
{ {
unsigned int uni; k_unicode(vc, conv_8bit_to_uni(value), up_flag);
if (kbd->kbdmode == VC_UNICODE)
uni = value;
else
uni = conv_8bit_to_uni(value);
k_unicode(vc, uni, up_flag);
} }
static void k_dead2(struct vc_data *vc, unsigned char value, char up_flag) static void k_dead2(struct vc_data *vc, unsigned char value, char up_flag)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment