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
commitf886b50976a72d2208b68dbed9e9448f87cc4377 (patch)
treea8bc2f5f4b323387ba006be4d620c9b0d7fc4de5
parente771884098c8cf084d33771b4b5e02f35de70285 (diff)
downloadvim-f886b50976a72d2208b68dbed9e9448f87cc4377.tar.gz
updated for version 7.3.002v7.3.001
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 fd178c99..0859dc75 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 79522a4f..76d3d9e2 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
};