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
index 0bad471e450c142607d5333a3aa0f367500b4f09..9609299717ecbfd14b6a487c152896af6e4a199d 100644 (file)
--- 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
index 3255f8abd3639b7db4e144ceb87845074b96f404..ad61cb92294d6c39a2e8221bac1c267acc740ec2 100644 (file)
--- 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 2d30d4fb1688e0ea953870421c90f684bc022388..2f0079d5cfd19057db86ad0a21db476c7690ea5d 100644 (file)
--- a/src/getchar.c
+++ b/src/getchar.c
@@ -1662,7 +1662,7 @@ merge_modifyOtherKeys(int c_arg, int *modifiers)
            && 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 23d6b4c92c630a51f8207c8292c3349387ba5345..e1c336a950006dbd6413ac56e135ec1a58c1987c 100644 (file)
--- 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
index d9e740da3fc0380dfc1f82912093958c851ab644..71cb071ab75faf1765742b213d874578301ed398 100644 (file)
--- 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
index 97767d292fd77c31d94769bd671ea7b9aad392f7..7c85a97e610bcf43e937dd4214e8ba4b45c57522 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -695,6 +695,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1285,
 /**/
     1284,
 /**/