diff options
| author | prollings <patrickrollings@gmail.com> | 2016-07-11 07:05:06 +1000 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2016-07-10 17:05:06 -0400 |
| commit | dcbd1c7b13e98766754c4e75d3bb59021248217e (patch) | |
| tree | 1224f777f931c26a5ff2445d372b6fe6f86c768b /src/nvim/screen.c | |
| parent | 29060a592c4c8ca4482a44b957a7bc332aed78e2 (diff) | |
| download | rneovim-dcbd1c7b13e98766754c4e75d3bb59021248217e.tar.gz rneovim-dcbd1c7b13e98766754c4e75d3bb59021248217e.tar.bz2 rneovim-dcbd1c7b13e98766754c4e75d3bb59021248217e.zip | |
vim-patch:7.4.1147 (#5005)
Problem: Conflict for "chartab". (Kazunobu Kuriyama)
Solution: Rename the global one to something less obvious. Move it into
src/chartab.c.
https://github.com/vim/vim/commit/88e8f9f14434a7cd538d0c159dc432bea869a5bd
Diffstat (limited to 'src/nvim/screen.c')
| -rw-r--r-- | src/nvim/screen.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/nvim/screen.c b/src/nvim/screen.c index 34eef83164..d67142822f 100644 --- a/src/nvim/screen.c +++ b/src/nvim/screen.c @@ -3416,12 +3416,10 @@ win_line ( /* * Handling of non-printable characters. */ - if (!(chartab[c & 0xff] & CT_PRINT_CHAR)) { - /* - * when getting a character from the file, we may have to - * turn it into something else on the way to putting it - * into "ScreenLines". - */ + if (!vim_isprintc(c)) { + // when getting a character from the file, we may have to + // turn it into something else on the way to putting it + // into "ScreenLines". if (c == TAB && (!wp->w_p_list || lcs_tab1)) { int tab_len = 0; long vcol_adjusted = vcol; // removed showbreak length |