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 #10822)
This commit is contained in:
zeertzjq
2022-07-31 11:37:20 +01:00
committed by Bram Moolenaar
parent 3a4cd39d47
commit 750209459c
6 changed files with 19 additions and 8 deletions

View File

@ -6453,7 +6453,7 @@ A jump table for the options with a short description can be found at |Q_op|.
'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,

View File

@ -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);

View File

@ -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);

View File

@ -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)

View File

@ -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&

View File

@ -735,6 +735,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
118,
/**/
117,
/**/