diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index e4e0d66..55c2146 100644
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -6453,7 +6453,7 @@
 	'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 86472ac..1fadc74 100644
--- a/src/globals.h
+++ b/src/globals.h
@@ -1729,5 +1729,5 @@
 // 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 7906d92..55787df 100644
--- a/src/register.c
+++ b/src/register.c
@@ -389,7 +389,7 @@
 
 	    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 2b0a294..a3d2b8f 100644
--- a/src/testdir/test_ins_complete.vim
+++ b/src/testdir/test_ins_complete.vim
@@ -397,7 +397,7 @@
         \ '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 ea5aee1..1f1bb9b 100644
--- a/src/testdir/test_messages.vim
+++ b/src/testdir/test_messages.vim
@@ -409,14 +409,14 @@
 
   " 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 @@
     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 770b1b6..5f276d4 100644
--- a/src/version.c
+++ b/src/version.c
@@ -736,6 +736,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    118,
+/**/
     117,
 /**/
     116,