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)

diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index e4e0d66129a108c6f3d7e9bacad630cc68ce9a15..55c2146b92ac33e44cbfe067134f9fd77d5e7dd5 100644 (file)
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -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,

diff --git a/src/globals.h b/src/globals.h
index 86472acda3597842ff3707358ada3452291a351b..1fadc744f5fb5d3efb571a6c75ca8a724b57a859 100644 (file)
--- 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 7906d92e21cc95be8512437e5648644d82b30d50..55787df4ee78ca83182b7b1d2a792f0913a123a9 100644 (file)
--- 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 2b0a2947a0e8c950d0b5fea522ec9eaa6a795902..a3d2b8f28a119dc2bf25661ef5c9be04f27dcc81 100644 (file)
--- 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 ea5aee1c50c2bd5e0250eb2c0b378e9041ee6c69..1f1bb9b2681d0d1dd2337ca6e5dc40741094d45c 100644 (file)
--- 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 770b1b6a235d2c62a0d209e8836086dc1946f067..5f276d4b79c6222bf5b325e52e8758002dcb29af 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -735,6 +735,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    118,
 /**/
     117,
 /**/