diff options
| author | Steve French <sfrench@us.ibm.com> | 2009-04-20 15:59:09 -0400 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2009-04-20 15:59:09 -0400 |
| commit | cbb7fe129bb2b836083ebcc256c43faff4b48cc2 (patch) | |
| tree | 65998c06e712be5f7cb72543a7c0cc2d0b1b4459 /drivers/char/vt.c | |
| parent | 7b0c8fcff47a885743125dd843db64af41af5a61 (diff) | |
| parent | a939b96cccdb65df80a52447ec8e4a6d79c56dbb (diff) | |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/char/vt.c')
| -rw-r--r-- | drivers/char/vt.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/vt.c b/drivers/char/vt.c index 2c1d133819b5..08151d4de489 100644 --- a/drivers/char/vt.c +++ b/drivers/char/vt.c | |||
| @@ -2274,7 +2274,7 @@ rescan_last_byte: | |||
| 2274 | continue; /* nothing to display */ | 2274 | continue; /* nothing to display */ |
| 2275 | } | 2275 | } |
| 2276 | /* Glyph not found */ | 2276 | /* Glyph not found */ |
| 2277 | if ((!(vc->vc_utf && !vc->vc_disp_ctrl) && c < 128) && !(c & ~charmask)) { | 2277 | if ((!(vc->vc_utf && !vc->vc_disp_ctrl) || c < 128) && !(c & ~charmask)) { |
| 2278 | /* In legacy mode use the glyph we get by a 1:1 mapping. | 2278 | /* In legacy mode use the glyph we get by a 1:1 mapping. |
| 2279 | This would make absolutely no sense with Unicode in mind, | 2279 | This would make absolutely no sense with Unicode in mind, |
| 2280 | but do this for ASCII characters since a font may lack | 2280 | but do this for ASCII characters since a font may lack |