mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-22 19:18:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:7.4.977

Browse Source 
Problem:    'linebreak' does not work properly when using "space" in
            'listchars'.
Solution:   (Hirohito Higashi, Christian Brabandt)

9bc01ebb95
This commit is contained in:
watiko
2016-02-11 16:48:51 +09:00
parent 8eb0d43c12
commit eab6ed778d
4 changed files with 66 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
src/nvim/screen.c
View File

@@ -2430,13 +2430,18 @@ win_line (
}
}
/* find start of trailing whitespace */
if (wp->w_p_list && lcs_trail) {
trailcol = (colnr_T)STRLEN(ptr);
while (trailcol > (colnr_T)0 && ascii_iswhite(ptr[trailcol - 1]))
--trailcol;
trailcol += (colnr_T) (ptr - line);
extra_check = TRUE;
if (wp->w_p_list) {
if (lcs_space || lcs_trail) {
extra_check = true;
}
// find start of trailing whitespace
if (lcs_trail) {
trailcol = (colnr_T)STRLEN(ptr);
while (trailcol > (colnr_T)0 && ascii_iswhite(ptr[trailcol - 1])) {
trailcol--;
}
trailcol += (colnr_T) (ptr - line);
}
}
/*
@@ -3201,27 +3206,7 @@ win_line (
}
}
++ptr;
// 'list': change char 160 to lcs_nbsp and space to lcs_space.
if (wp->w_p_list
&& (((c == 160 || (mb_utf8 && (mb_c == 160 || mb_c == 0x202f)))
&& lcs_nbsp)
|| (c == ' ' && lcs_space && ptr - line <= trailcol))) {
c = (c == ' ') ? lcs_space : lcs_nbsp;
if (area_attr == 0 && search_attr == 0) {
n_attr = 1;
extra_attr = hl_attr(HLF_8);
saved_attr2 = char_attr; /* save current attr */
}
mb_c = c;
if (enc_utf8 && (*mb_char2len)(c) > 1) {
mb_utf8 = TRUE;
u8cc[0] = 0;
c = 0xc0;
} else
mb_utf8 = FALSE;
}
ptr++;
if (extra_check) {
bool can_spell = true;
@@ -3368,6 +3353,28 @@ win_line (
}
}
// 'list': change char 160 to lcs_nbsp and space to lcs_space.
if (wp->w_p_list
&& (((c == 160
|| (mb_utf8 && (mb_c == 160 || mb_c == 0x202f)))
&& lcs_nbsp)
|| (c == ' ' && lcs_space && ptr - line <= trailcol))) {
c = (c == ' ') ? lcs_space : lcs_nbsp;
if (area_attr == 0 && search_attr == 0) {
n_attr = 1;
extra_attr = hl_attr(HLF_8);
saved_attr2 = char_attr; // save current attr
}
mb_c = c;
if (enc_utf8 && (*mb_char2len)(c) > 1) {
mb_utf8 = true;
u8cc[0] = 0;
c = 0xc0;
} else {
mb_utf8 = false;
}
}
if (trailcol != MAXCOL && ptr > line + trailcol && c == ' ') {
c = lcs_trail;
if (!attr_pri) {