summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2010-08-16 21:53:27 +0200
committerBram Moolenaar <Bram@vim.org>2010-08-16 21:53:27 +0200
commitda9836cfa9dc53679295095cd0e91d87dc0626dd (patch)
treec66356714e69e3e3719d2924f6d8681523a6af85
parent7f03644116399ebcf036ef7ea9f62391a948ff54 (diff)
downloadvim-da9836cfa9dc53679295095cd0e91d87dc0626dd.zip
updated for version 7.3.002
Problem: ":find" completion doesn't work when halfway an environment variable. (Dominique Pelle) Solution: Only use in-path completion when expanding file names. (Nazri Ramliy)
-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
};