diff options
| author | zeertzjq <zeertzjq@outlook.com> | 2022-07-31 11:37:20 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2022-07-31 11:37:20 +0100 |
| commit | 750209459c9e54030409afe8f4ad59570600b5c4 (patch) | |
| tree | 283538c45603d0ea62c1800eb67a49f8b6f66eef /src | |
| parent | 3a4cd39d476474e20e88ebf120ca6070cc0d0072 (diff) | |
patch 9.0.0118: no test for what patch 9.0.0155 fixesv9.0.0118
Problem: No test for what patch 9.0.0155 fixes.
Solution: Add a test. Fix typos. (closes #10822)
Diffstat (limited to 'src')
| -rw-r--r-- | src/globals.h | 2 | ||||
| -rw-r--r-- | src/register.c | 2 | ||||
| -rw-r--r-- | src/testdir/test_ins_complete.vim | 2 | ||||
| -rw-r--r-- | src/testdir/test_messages.vim | 17 | ||||
| -rw-r--r-- | src/version.c | 2 |
5 files changed, 18 insertions, 7 deletions
diff --git a/src/globals.h b/src/globals.h index 86472acda3..1fadc744f5 100644 --- a/src/globals.h +++ b/src/globals.h @@ -1729,5 +1729,5 @@ EXTERN int channel_need_redraw INIT(= FALSE); // 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); diff --git a/src/register.c b/src/register.c index 7906d92e21..55787df4ee 100644 --- 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); diff --git a/src/testdir/test_ins_complete.vim b/src/testdir/test_ins_complete.vim index 2b0a2947a0..a3d2b8f28a 100644 --- 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) diff --git a/src/testdir/test_messages.vim b/src/testdir/test_messages.vim index ea5aee1c50..1f1bb9b268 100644 --- 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& diff --git a/src/version.c b/src/version.c index 770b1b6a23..5f276d4b79 100644 --- a/src/version.c +++ b/src/version.c @@ -736,6 +736,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 118, +/**/ 117, /**/ 116, |