diff options
| author | Paul Mackerras <paulus@samba.org> | 2008-12-15 22:38:58 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2008-12-15 22:38:58 -0500 |
| commit | 1e1c568d6c66d1e2e345fd15e2a1ceafc5d7e33a (patch) | |
| tree | 0cf88547108a750d6eb910564ef5bf0ffb5ceef3 /drivers/char/vt.c | |
| parent | 91cac623262c1c0cd298c5c648a8bd2b647c264d (diff) | |
| parent | 23e0e8afafd9ac065d81506524adf3339584044b (diff) | |
Merge branch 'merge' into next
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 a5af6072e2b3..008176edbd64 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 |