summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2022-01-18 13:43:58 +0000
committerBram Moolenaar <Bram@vim.org>2022-01-18 13:43:58 +0000
commit113b8dc111febf605cd1492788353be6c3931fce (patch)
treeca881dba714b28a3b458b81afdbf3d41416fc3b9 /src
parent840f16202e1ae2d574507ef52a7e8a98775f243c (diff)
patch 8.2.4134: MS-Windows: test for import with absolute path failsv8.2.4134
Problem: MS-Windows: test for import with absolute path fails. Solution: Handle path starting with slash as an absolute path.
Diffstat (limited to 'src')
-rw-r--r--src/version.c2
-rw-r--r--src/vim9script.c8
2 files changed, 9 insertions, 1 deletions
diff --git a/src/version.c b/src/version.c
index 1e9ab2dd96..8ac5c08670 100644
--- a/src/version.c
+++ b/src/version.c
@@ -751,6 +751,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 4134,
+/**/
4133,
/**/
4132,
diff --git a/src/vim9script.c b/src/vim9script.c
index 41df6bfc47..b356347868 100644
--- a/src/vim9script.c
+++ b/src/vim9script.c
@@ -468,7 +468,13 @@ handle_import(
vim_free(from_name);
}
}
- else if (mch_isFullName(tv.vval.v_string))
+ else if (mch_isFullName(tv.vval.v_string)
+#ifdef BACKSLASH_IN_FILENAME
+ // On MS-Windows omitting the drive is still handled like an
+ // absolute path, not using 'runtimepath'.
+ || *tv.vval.v_string == '/' || *tv.vval.v_string == '\\'
+#endif
+ )
{
// Absolute path: "/tmp/name.vim"
if (is_autoload)