From fd70018e21b8ce4b8c9f6074854e0174a87dfbb5 Mon Sep 17 00:00:00 2001 From: zeertzjq Date: Sun, 19 Dec 2021 09:55:17 +0800 Subject: vim-patch:8.2.2508: cannot change the character displayed in non existing lines Problem: Cannot change the character displayed in non existing lines. Solution: Add the "eob" item to 'fillchars'. (closes vim/vim#7832, closes vim/vim#3820) https://github.com/vim/vim/commit/a98f8a230596d8fb44cc68321de72980a21428cb Nvim has already implemented this feature, so this just ports the tests and docs. --- src/nvim/testdir/test_display.vim | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) (limited to 'src') diff --git a/src/nvim/testdir/test_display.vim b/src/nvim/testdir/test_display.vim index 12327f34d6..f8ebb31b45 100644 --- a/src/nvim/testdir/test_display.vim +++ b/src/nvim/testdir/test_display.vim @@ -263,6 +263,28 @@ func Test_display_scroll_at_topline() call StopVimInTerminal(buf) endfunc +" Test for 'eob' (EndOfBuffer) item in 'fillchars' +func Test_eob_fillchars() + " default value (skipped) + " call assert_match('eob:\~', &fillchars) + " invalid values + call assert_fails(':set fillchars=eob:', 'E474:') + call assert_fails(':set fillchars=eob:xy', 'E474:') + call assert_fails(':set fillchars=eob:\255', 'E474:') + call assert_fails(':set fillchars=eob:', 'E474:') + " default is ~ + new + call assert_equal('~', Screenline(2)) + set fillchars=eob:+ + redraw! + call assert_equal('+', Screenline(2)) + set fillchars=eob:\ + redraw! + call assert_equal(' ', nr2char(screenchar(2, 1))) + set fillchars& + close +endfunc + func Test_display_linebreak_breakat() new vert resize 25 -- cgit From c05e6476813a6079487c302fb6ed29ba655b0e8e Mon Sep 17 00:00:00 2001 From: zeertzjq Date: Sun, 19 Dec 2021 09:55:17 +0800 Subject: vim-patch:8.2.2641: display test fails because of lacking redraw Problem: Display test fails because of lacking redraw. Solution: Add a redraw command. https://github.com/vim/vim/commit/2cec027af461095f96dec3bfd036c267f790b0f4 --- src/nvim/testdir/test_display.vim | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/nvim/testdir/test_display.vim b/src/nvim/testdir/test_display.vim index f8ebb31b45..6dcc45aca9 100644 --- a/src/nvim/testdir/test_display.vim +++ b/src/nvim/testdir/test_display.vim @@ -274,12 +274,13 @@ func Test_eob_fillchars() call assert_fails(':set fillchars=eob:', 'E474:') " default is ~ new + redraw call assert_equal('~', Screenline(2)) set fillchars=eob:+ - redraw! + redraw call assert_equal('+', Screenline(2)) set fillchars=eob:\ - redraw! + redraw call assert_equal(' ', nr2char(screenchar(2, 1))) set fillchars& close -- cgit From 0e18cf4b6d2dccd303724c27ae90097cc033f233 Mon Sep 17 00:00:00 2001 From: zeertzjq Date: Sun, 19 Dec 2021 09:55:17 +0800 Subject: vim-patch:8.2.3846: no error when using control character for 'lcs' or 'fcs' Problem: No error when using control character for 'lcs' or 'fcs'. Solution: Use char2cells() to check the width. (closes vim/vim#9369) https://github.com/vim/vim/commit/60618c8f1a7ea55452837a446525272142286471 --- src/nvim/option.c | 8 ++++---- src/nvim/testdir/test_display.vim | 2 ++ src/nvim/testdir/test_listchars.vim | 16 +++++++++++++++- 3 files changed, 21 insertions(+), 5 deletions(-) (limited to 'src') diff --git a/src/nvim/option.c b/src/nvim/option.c index 2ceb1bd992..fba3de1fcc 100644 --- a/src/nvim/option.c +++ b/src/nvim/option.c @@ -3610,7 +3610,7 @@ static char *set_chars_option(win_T *wp, char_u **varp, bool set) c2 = c3 = 0; s = p + len + 1; c1 = get_encoded_char_adv(&s); - if (c1 == 0 || utf_char2cells(c1) > 1) { + if (c1 == 0 || char2cells(c1) > 1) { return e_invarg; } if (tab[i].cp == &wp->w_p_lcs_chars.tab2) { @@ -3618,12 +3618,12 @@ static char *set_chars_option(win_T *wp, char_u **varp, bool set) return e_invarg; } c2 = get_encoded_char_adv(&s); - if (c2 == 0 || utf_char2cells(c2) > 1) { + if (c2 == 0 || char2cells(c2) > 1) { return e_invarg; } if (!(*s == ',' || *s == NUL)) { c3 = get_encoded_char_adv(&s); - if (c3 == 0 || utf_char2cells(c3) > 1) { + if (c3 == 0 || char2cells(c3) > 1) { return e_invarg; } } @@ -3657,7 +3657,7 @@ static char *set_chars_option(win_T *wp, char_u **varp, bool set) multispace_len = 0; while (*s != NUL && *s != ',') { c1 = get_encoded_char_adv(&s); - if (c1 == 0 || utf_char2cells(c1) > 1) { + if (c1 == 0 || char2cells(c1) > 1) { return e_invarg; } multispace_len++; diff --git a/src/nvim/testdir/test_display.vim b/src/nvim/testdir/test_display.vim index 6dcc45aca9..c2a9683f7c 100644 --- a/src/nvim/testdir/test_display.vim +++ b/src/nvim/testdir/test_display.vim @@ -272,6 +272,8 @@ func Test_eob_fillchars() call assert_fails(':set fillchars=eob:xy', 'E474:') call assert_fails(':set fillchars=eob:\255', 'E474:') call assert_fails(':set fillchars=eob:', 'E474:') + call assert_fails(":set fillchars=eob:\x01", 'E474:') + call assert_fails(':set fillchars=eob:\\x01', 'E474:') " default is ~ new redraw diff --git a/src/nvim/testdir/test_listchars.vim b/src/nvim/testdir/test_listchars.vim index f4ee539803..0bcbd9c4a5 100644 --- a/src/nvim/testdir/test_listchars.vim +++ b/src/nvim/testdir/test_listchars.vim @@ -331,7 +331,7 @@ func Test_listchars_invalid() call assert_fails('set listchars=space:xx', 'E474:') call assert_fails('set listchars=tab:xxxx', 'E474:') - " Has non-single width character + " Has double-width character call assert_fails('set listchars=space:·', 'E474:') call assert_fails('set listchars=tab:·x', 'E474:') call assert_fails('set listchars=tab:x·', 'E474:') @@ -339,6 +339,20 @@ func Test_listchars_invalid() call assert_fails('set listchars=multispace:·', 'E474:') call assert_fails('set listchars=multispace:xxx·', 'E474:') + " Has control character + call assert_fails("set listchars=space:\x01", 'E474:') + call assert_fails("set listchars=tab:\x01x", 'E474:') + call assert_fails("set listchars=tab:x\x01", 'E474:') + call assert_fails("set listchars=tab:xx\x01", 'E474:') + call assert_fails("set listchars=multispace:\x01", 'E474:') + call assert_fails("set listchars=multispace:xxx\x01", 'E474:') + call assert_fails('set listchars=space:\\x01', 'E474:') + call assert_fails('set listchars=tab:\\x01x', 'E474:') + call assert_fails('set listchars=tab:x\\x01', 'E474:') + call assert_fails('set listchars=tab:xx\\x01', 'E474:') + call assert_fails('set listchars=multispace:\\x01', 'E474:') + call assert_fails('set listchars=multispace:xxx\\x01', 'E474:') + enew! set ambiwidth& listchars& ff& endfunction -- cgit