summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/misc1.c3
-rw-r--r--src/version.c2
2 files changed, 4 insertions, 1 deletions
diff --git a/src/misc1.c b/src/misc1.c
index fd178c99d..0859dc759 100644
--- a/src/misc1.c
+++ b/src/misc1.c
@@ -9317,7 +9317,8 @@ is_unique(maybe_unique, gap, i)
continue; /* it's different when it's shorter */
rival = other_paths[j] + other_path_len - candidate_len;
- if (fnamecmp(maybe_unique, rival) == 0)
+ if (fnamecmp(maybe_unique, rival) == 0
+ && (rival == other_paths[j] || vim_ispathsep(*(rival - 1))))
return FALSE; /* match */
}
diff --git a/src/version.c b/src/version.c
index 79522a4f3..76d3d9e26 100644
--- a/src/version.c
+++ b/src/version.c
@@ -715,6 +715,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1,
+/**/
0
};