diff --git a/src/charset.c b/src/charset.c
index 0bad471..9609299 100644
--- a/src/charset.c
+++ b/src/charset.c
@@ -538,7 +538,7 @@
 
 /*
  * Convert non-printable character to two or more printable characters in
- * "buf[]".  "charbuf" needs to be able to hold five bytes.
+ * "charbuf[]".  "charbuf" needs to be able to hold five bytes.
  * Does NOT work for multi-byte characters, c must be <= 255.
  */
     void
diff --git a/src/feature.h b/src/feature.h
index 3255f8a..ad61cb9 100644
--- a/src/feature.h
+++ b/src/feature.h
@@ -273,8 +273,8 @@
 #if defined(FEAT_NORMAL) \
 	&& defined(FEAT_EVAL) \
 	&& ((defined(HAVE_GETTIMEOFDAY) && defined(HAVE_SYS_TIME_H) \
-        && (!defined(MACOS_X) || defined(HAVE_DISPATCH_DISPATCH_H))) \
-		|| defined(MSWIN))
+		&& (!defined(MACOS_X) || defined(HAVE_DISPATCH_DISPATCH_H))) \
+	    || defined(MSWIN))
 # define FEAT_RELTIME
 #endif
 
diff --git a/src/getchar.c b/src/getchar.c
index 2d30d4f..2f0079d 100644
--- a/src/getchar.c
+++ b/src/getchar.c
@@ -1662,7 +1662,7 @@
 	    && c >= 0 && c <= 127)
     {
 	c += 0x80;
-	*modifiers &= ~(MOD_MASK_META|MOD_MASK_ALT);
+	*modifiers &= ~(MOD_MASK_META | MOD_MASK_ALT);
     }
     return c;
 }
diff --git a/src/testdir/test_cmdline.vim b/src/testdir/test_cmdline.vim
index 23d6b4c..e1c336a 100644
--- a/src/testdir/test_cmdline.vim
+++ b/src/testdir/test_cmdline.vim
@@ -274,7 +274,7 @@
   call term_sendkeys(buf, ":set cmdheight-=2\<CR>")
   call VerifyScreenDump(buf, 'Test_changing_cmdheight_4', {})
 
-  " reducing window size and then setting cmdheight 
+  " reducing window size and then setting cmdheight
   call term_sendkeys(buf, ":resize -1\<CR>")
   call term_sendkeys(buf, ":set cmdheight=1\<CR>")
   call VerifyScreenDump(buf, 'Test_changing_cmdheight_5', {})
@@ -491,7 +491,7 @@
   call assert_equal([], l)
 
   if !has('ruby')
-    " global_functions[] has an entry but it doesn't have an implemention
+    " global_functions[] has an entry but it doesn't have an implementation
     let l = getcompletion('ruby', 'function')
     call assert_equal([], l)
   endif
diff --git a/src/testdir/view_util.vim b/src/testdir/view_util.vim
index d9e740d..71cb071 100644
--- a/src/testdir/view_util.vim
+++ b/src/testdir/view_util.vim
@@ -51,6 +51,7 @@
   return attrs
 endfunc
 
+" Create a new window with the requested size and fix it.
 func NewWindow(height, width) abort
   exe a:height . 'new'
   exe a:width . 'vsp'
diff --git a/src/version.c b/src/version.c
index 97767d2..7c85a97 100644
--- a/src/version.c
+++ b/src/version.c
@@ -696,6 +696,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1285,
+/**/
     1284,
 /**/
     1283,