# HG changeset patch
# User Bram Moolenaar <Bram@vim.org>
# Date 1675620903 -3600
# Node ID 9fc3b3928ad597cebab4cb1ca76d5bb03dc8dd08
# Parent  d919c7b5c568d69274b07167ea89a6edb471b315
patch 9.0.1285: various small problems

Commit: https://github.com/vim/vim/commit/a9a6b0323ea3dc5e4d11d28e7c9ae3534e02ee54
Author: Bram Moolenaar <Bram@vim.org>
Date:   Sun Feb 5 18:00:42 2023 +0000

    patch 9.0.1285: various small problems

    Problem:    Various small problems.
    Solution:   Adjust white space and comments.

diff --git a/src/charset.c b/src/charset.c
--- a/src/charset.c
+++ b/src/charset.c
@@ -538,7 +538,7 @@ transchar_byte(int c)
 
 /*
  * 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
--- 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
--- a/src/getchar.c
+++ b/src/getchar.c
@@ -1662,7 +1662,7 @@ merge_modifyOtherKeys(int c_arg, int *mo
 	    && 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
--- a/src/testdir/test_cmdline.vim
+++ b/src/testdir/test_cmdline.vim
@@ -274,7 +274,7 @@ func Test_changing_cmdheight()
   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 @@ func Test_getcompletion()
   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
--- a/src/testdir/view_util.vim
+++ b/src/testdir/view_util.vim
@@ -51,6 +51,7 @@ func ScreenAttrs(lnum, width) abort
   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
--- a/src/version.c
+++ b/src/version.c
@@ -696,6 +696,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1285,
+/**/
     1284,
 /**/
     1283,