diff options
| author | Björn Linse <bjorn.linse@gmail.com> | 2016-11-05 18:12:14 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-05 18:12:14 +0100 |
| commit | 9147331e212e8d0fff0f30344007faffd42609ee (patch) | |
| tree | 6d1853a72b94ce19ba0cc163c664a9a206da0091 /src/nvim/screen.c | |
| parent | 32d9c19e294f38a6adae6e055fc606fc3fd33f2f (diff) | |
| parent | 4ab3fe8eaadb5456eeafc49df2fb0ecf71d836cc (diff) | |
| download | rneovim-9147331e212e8d0fff0f30344007faffd42609ee.tar.gz rneovim-9147331e212e8d0fff0f30344007faffd42609ee.tar.bz2 rneovim-9147331e212e8d0fff0f30344007faffd42609ee.zip | |
Merge pull request #2905 from bfredl/utf8
Only allow encoding=utf-8 and simplify multibyte code
Diffstat (limited to 'src/nvim/screen.c')
| -rw-r--r-- | src/nvim/screen.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/nvim/screen.c b/src/nvim/screen.c index 3e4d016fe7..cee3c62f43 100644 --- a/src/nvim/screen.c +++ b/src/nvim/screen.c @@ -5292,7 +5292,7 @@ void screen_puts_len(char_u *text, int textlen, int row, int col, int attr) int force_redraw_next = FALSE; int need_redraw; - const int l_has_mbyte = has_mbyte; + const bool l_has_mbyte = has_mbyte; const bool l_enc_utf8 = enc_utf8; const int l_enc_dbcs = enc_dbcs; @@ -5459,9 +5459,6 @@ void screen_puts_len(char_u *text, int textlen, int row, int col, int attr) /* If we detected the next character needs to be redrawn, but the text * doesn't extend up to there, update the character here. */ if (force_redraw_next && col < screen_Columns) { - if (l_enc_dbcs != 0 && dbcs_off2cells(off, max_off) > 1) - screen_char_2(off, row, col); - else screen_char(off, row, col); } } |