patch 9.1.1648: MS-Windows: some style issues with patch v9.1.1646

Problem:  MS-Windows: some style issues with patch v9.1.1646
Solution: Fix typose and code style issues (zeertzjq).

closes: #18036

Signed-off-by: zeertzjq <zeertzjq@outlook.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>

diff --git a/src/filepath.c b/src/filepath.c
index fc3caaf08f7b481d2ab5a3023af40d11f31af0b6..7d115eeda6eac648b55b80dde9dbe59d74d75c22 100644 (file)
--- a/src/filepath.c
+++ b/src/filepath.c
@@ -360,7 +360,7 @@ repeat:
 
        // FullName_save() is slow, don't use it when not needed.
        if (*p != NUL || !vim_isAbsName(*fnamep)
-#ifdef MSWIN   // enforce drive letter on windows paths
+#ifdef MSWIN   // enforce drive letter on Windows paths
                || **fnamep == '/' || **fnamep == '\\'
 #endif
        )
@@ -3114,9 +3114,9 @@ vim_fnamencmp(char_u *x, char_u *y, size_t len)
     int                cx = NUL;
     int                cy = NUL;
 
-#ifdef MSWIN
+# ifdef MSWIN
     /*
-     * To allow proper comparisson of absolute paths:
+     * To allow proper comparison of absolute paths:
      *  - one with explicit drive letter C:\xxx
      *  - another with implicit drive letter \xxx
      * advance the pointer, of the explicit one, to skip the drive
@@ -3135,7 +3135,7 @@ vim_fnamencmp(char_u *x, char_u *y, size_t len)
            py += mb_ptr2len(py);
            cy = PTR2CHAR(py);
            if (cy == ':' && drive == _getdrive())
-           { // skip the drive for comparisson
+           { // skip the drive for comparison
                py += mb_ptr2len(py);
                break;
            }
@@ -3148,7 +3148,7 @@ vim_fnamencmp(char_u *x, char_u *y, size_t len)
        px = py;
        py = tmp;
     }
-#endif
+# endif
 
     while (len > 0)
     {

diff --git a/src/os_mswin.c b/src/os_mswin.c
index 405a6c5c138bfa93562d0453f3a36d98270220f1..eefb41d998761474c7c388f8fffc41c7fab619aa 100644 (file)
--- a/src/os_mswin.c
+++ b/src/os_mswin.c
@@ -319,7 +319,7 @@ mch_FullName(
 mch_isFullName(char_u *fname)
 {
     // A name like "d:/foo" and "//server/share" is absolute.  "d:foo" is not.
-    // /foo and \foo are absolute too because windows keeps a current drive.
+    // /foo and \foo are absolute too because Windows keeps a current drive.
     // Another way to check is to use mch_FullName() and see if the result is
     // the same as the name or mch_FullName() fails.  However, this has quite a
     // bit of overhead, so let's not do that.

diff --git a/src/testdir/test_cd.vim b/src/testdir/test_cd.vim
index 78c6c577e9d41e535b7fac6ccf5410c3f10e89d8..c12a73ac342099881a22039e9c967707f9a41ff6 100644 (file)
--- a/src/testdir/test_cd.vim
+++ b/src/testdir/test_cd.vim
@@ -223,7 +223,7 @@ func Test_cd_completion()
   set cdpath&
 
   if has('win32')
-    " Test windows absolute path completion
+    " Test Windows absolute path completion
     " Retrieve a suitable dir in the current drive
     let dir = readdir('/', 'isdirectory("/" .. v:val) && len(v:val) > 2')[-1]
     " Get partial path

diff --git a/src/version.c b/src/version.c
index c62e443ff856ffc52a058e39f93684d92d2f2a0b..903c0960d7ee2ae9069674d618c2d9be20f44d15 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -719,6 +719,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1648,
 /**/
     1647,
 /**/