]> granicus.if.org Git - vim/commitdiff
updated for version 7.3.002 v7.3.001
authorBram Moolenaar <Bram@vim.org>
Mon, 16 Aug 2010 19:53:27 +0000 (21:53 +0200)
committerBram Moolenaar <Bram@vim.org>
Mon, 16 Aug 2010 19:53:27 +0000 (21:53 +0200)
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)

src/misc1.c
src/version.c

index fd178c99dc72adb04215ed7cfa39e315db8365b4..0859dc759500b930c0a4e81669efa3f4b0cc7481 100644 (file)
@@ -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 */
     }
 
index 79522a4f31bc88c6e10aaf962326e1693125c026..76d3d9e26cb033690adc0edc850509262b5a7f65 100644 (file)
@@ -714,6 +714,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1,
 /**/
     0
 };