Mercurial > vim
changeset 29554:d413dccd4f8a v9.0.0118
patch 9.0.0118: no test for what patch 9.0.0155 fixes
Commit: https://github.com/vim/vim/commit/750209459c9e54030409afe8f4ad59570600b5c4
Author: zeertzjq <zeertzjq@outlook.com>
Date: Sun Jul 31 11:37:20 2022 +0100
patch 9.0.0118: no test for what patch 9.0.0155 fixes
Problem: No test for what patch 9.0.0155 fixes.
Solution: Add a test. Fix typos. (closes https://github.com/vim/vim/issues/10822)
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Sun, 31 Jul 2022 12:45:05 +0200 |
| parents | 3d658f221ab0 |
| children | 72a842b8f99f |
| files | runtime/doc/options.txt src/globals.h src/register.c src/testdir/test_ins_complete.vim src/testdir/test_messages.vim src/version.c |
| diffstat | 6 files changed, 19 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/runtime/doc/options.txt +++ b/runtime/doc/options.txt @@ -6453,7 +6453,7 @@ A jump table for the options with a shor 'cmdheight' is zero, the ruler is not shown. Otherwise it is shown in the last line of the screen. If the statusline is given by 'statusline' (i.e. not empty), this option takes precedence over - 'ruler' and 'rulerformat' + 'ruler' and 'rulerformat'. If the number of characters displayed is different from the number of bytes in the text (e.g., for a TAB or a multibyte character), both the text column (byte number) and the screen column are shown,
--- a/src/globals.h +++ b/src/globals.h @@ -1729,5 +1729,5 @@ EXTERN int channel_need_redraw INIT(= FA // overrules p_magic. Otherwise set to OPTION_MAGIC_NOT_SET. EXTERN optmagic_T magic_overruled INIT(= OPTION_MAGIC_NOT_SET); -// Set when 'cmdheight' is changed from non-zero to one temporarily. +// Set when 'cmdheight' is changed from zero to one temporarily. EXTERN int made_cmdheight_nonzero INIT(= FALSE);
--- a/src/register.c +++ b/src/register.c @@ -389,7 +389,7 @@ do_record(int c) if (p_ch < 1) { - // Enable macro indicator temporary + // Enable macro indicator temporarily set_option_value((char_u *)"ch", 1L, NULL, 0); update_screen(VALID);
--- a/src/testdir/test_ins_complete.vim +++ b/src/testdir/test_ins_complete.vim @@ -397,7 +397,7 @@ func Test_CompleteDone_modify() \ 'user_data': '', \ } let v:completed_item = value - call assert_equal(v:completed_item, value) + call assert_equal(value, v:completed_item) endfunc func CompleteTest(findstart, query)
--- a/src/testdir/test_messages.vim +++ b/src/testdir/test_messages.vim @@ -409,14 +409,14 @@ func Test_cmdheight_zero() " Check change/restore cmdheight when macro call feedkeys("qa", "xt") - call assert_equal(&cmdheight, 1) + call assert_equal(1, &cmdheight) call feedkeys("q", "xt") - call assert_equal(&cmdheight, 0) + call assert_equal(0, &cmdheight) call setline(1, 'somestring') call feedkeys("y", "n") %s/somestring/otherstring/gc - call assert_equal(getline(1), 'otherstring') + call assert_equal('otherstring', getline(1)) call feedkeys("g\<C-g>", "xt") call assert_match( @@ -428,7 +428,16 @@ func Test_cmdheight_zero() split endfor only - call assert_equal(&cmdheight, 0) + call assert_equal(0, &cmdheight) + + " Check that pressing ":" should not scroll a window + " Check for what patch 9.0.0115 fixes + botright 10new + call setline(1, range(12)) + 7 + call feedkeys(":\"\<C-R>=line('w0')\<CR>\<CR>", "xt") + call assert_equal('"1', @:) + bwipe! set cmdheight& set showcmd&