patch 9.1.1648: MS-Windows: some style issues with patch v9.1.1646
Commit:
https://github.com/vim/vim/commit/14afa278c1bcb2df51b647ffda2821c5294eb7ff
Author: zeertzjq <[email protected]>
Date: Mon Aug 18 21:01:46 2025 +0200
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 <[email protected]>
Signed-off-by: Christian Brabandt <[email protected]>
diff --git a/src/filepath.c b/src/filepath.c
index fc3caaf08..7d115eeda 100644
--- 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 405a6c5c1..eefb41d99 100644
--- 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 oo are absolute too because windows keeps a current drive.
+ // /foo and oo 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 78c6c577e..c12a73ac3 100644
--- 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 c62e443ff..903c0960d 100644
--- 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,
/**/
--
--
You received this message from the "vim_dev" maillist.
Do not top-post! Type your reply below the text you are replying to.
For more information, visit http://www.vim.org/maillist.php
---
You received this message because you are subscribed to the Google Groups
"vim_dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
To view this discussion visit
https://groups.google.com/d/msgid/vim_dev/E1uo5Jx-005O7c-Jn%40256bit.org.
