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.

88e8f9f144
This commit is contained in:
prollings
2016-07-11 07:05:06 +10:00
committed by Justin M. Keyes
parent 29060a592c
commit dcbd1c7b13
8 changed files with 51 additions and 63 deletions

View File

@@ -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