mirror of
https://github.com/vim/vim.git
synced 2025-09-24 03:44:06 -04:00
patch 8.1.2245: third character of 'listchars' tab shows in wrong place
Problem: Third character of 'listchars' tab shows in wrong place when 'breakindent' is set. Solution: Set c_final to NUL. (Naruhiko Nishino, closes #5165)
This commit is contained in:
@@ -1173,6 +1173,7 @@ win_line(
|
|||||||
# endif
|
# endif
|
||||||
p_extra = NULL;
|
p_extra = NULL;
|
||||||
c_extra = ' ';
|
c_extra = ' ';
|
||||||
|
c_final = NUL;
|
||||||
n_extra = get_breakindent_win(wp,
|
n_extra = get_breakindent_win(wp,
|
||||||
ml_get_buf(wp->w_buffer, lnum, FALSE));
|
ml_get_buf(wp->w_buffer, lnum, FALSE));
|
||||||
// Correct end of highlighted area for 'breakindent',
|
// Correct end of highlighted area for 'breakindent',
|
||||||
@@ -1647,9 +1648,8 @@ win_line(
|
|||||||
#ifdef FEAT_LINEBREAK
|
#ifdef FEAT_LINEBREAK
|
||||||
int c0;
|
int c0;
|
||||||
#endif
|
#endif
|
||||||
|
VIM_CLEAR(p_extra_free);
|
||||||
|
|
||||||
if (p_extra_free != NULL)
|
|
||||||
VIM_CLEAR(p_extra_free);
|
|
||||||
// Get a character from the line itself.
|
// Get a character from the line itself.
|
||||||
c = *ptr;
|
c = *ptr;
|
||||||
#ifdef FEAT_LINEBREAK
|
#ifdef FEAT_LINEBREAK
|
||||||
|
@@ -614,3 +614,44 @@ func Test_breakindent16_vartabs()
|
|||||||
call s:compare_lines(expect, lines)
|
call s:compare_lines(expect, lines)
|
||||||
call s:close_windows('set vts&')
|
call s:close_windows('set vts&')
|
||||||
endfunc
|
endfunc
|
||||||
|
|
||||||
|
func Test_breakindent17_vartabs()
|
||||||
|
if !has("vartabs")
|
||||||
|
return
|
||||||
|
endif
|
||||||
|
let s:input = ""
|
||||||
|
call s:test_windows('setl breakindent list listchars=tab:<-> showbreak=+++')
|
||||||
|
call setline(1, "\t" . repeat('a', 63))
|
||||||
|
vert resize 30
|
||||||
|
norm! 1gg$
|
||||||
|
redraw!
|
||||||
|
let lines = s:screen_lines(1, 30)
|
||||||
|
let expect = [
|
||||||
|
\ "<-->aaaaaaaaaaaaaaaaaaaaaaaaaa",
|
||||||
|
\ " +++aaaaaaaaaaaaaaaaaaaaaaa",
|
||||||
|
\ " +++aaaaaaaaaaaaaa ",
|
||||||
|
\ ]
|
||||||
|
call s:compare_lines(expect, lines)
|
||||||
|
call s:close_windows('set breakindent& list& listchars& showbreak&')
|
||||||
|
endfunc
|
||||||
|
|
||||||
|
func Test_breakindent18_vartabs()
|
||||||
|
if !has("vartabs")
|
||||||
|
return
|
||||||
|
endif
|
||||||
|
let s:input = ""
|
||||||
|
call s:test_windows('setl breakindent list listchars=tab:<->')
|
||||||
|
call setline(1, "\t" . repeat('a', 63))
|
||||||
|
vert resize 30
|
||||||
|
norm! 1gg$
|
||||||
|
redraw!
|
||||||
|
let lines = s:screen_lines(1, 30)
|
||||||
|
let expect = [
|
||||||
|
\ "<-->aaaaaaaaaaaaaaaaaaaaaaaaaa",
|
||||||
|
\ " aaaaaaaaaaaaaaaaaaaaaaaaaa",
|
||||||
|
\ " aaaaaaaaaaa ",
|
||||||
|
\ ]
|
||||||
|
call s:compare_lines(expect, lines)
|
||||||
|
call s:close_windows('set breakindent& list& listchars&')
|
||||||
|
endfunc
|
||||||
|
|
||||||
|
@@ -741,6 +741,8 @@ static char *(features[]) =
|
|||||||
|
|
||||||
static int included_patches[] =
|
static int included_patches[] =
|
||||||
{ /* Add new patch number below this line */
|
{ /* Add new patch number below this line */
|
||||||
|
/**/
|
||||||
|
2245,
|
||||||
/**/
|
/**/
|
||||||
2244,
|
2244,
|
||||||
/**/
|
/**/
|
||||||
|
Reference in New Issue
Block a user