diff options
author | Bram Moolenaar <Bram@vim.org> | 2013-04-24 17:34:20 +0200 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2013-04-24 17:34:20 +0200 |
commit | 811fe63f398767db412c4f21a31f5e746951dd26 (patch) | |
tree | 2281a327ca8266e968c5eb52a436786f83f12ac2 | |
parent | 567199b68fb5a171c0c006e9d4ac94ca61c5cda0 (diff) |
updated for version 7.3.917v7.3.917
Problem: When a path ends in a backslash appending a comma has the wrong
effect.
Solution: Replace a trailing backslash with a slash. (Nazri Ramliy)
-rw-r--r-- | src/misc1.c | 9 | ||||
-rw-r--r-- | src/testdir/test73.in | 10 | ||||
-rw-r--r-- | src/testdir/test73.ok | 2 | ||||
-rw-r--r-- | src/version.c | 2 |
4 files changed, 23 insertions, 0 deletions
diff --git a/src/misc1.c b/src/misc1.c index 96d268d49d..789aad373b 100644 --- a/src/misc1.c +++ b/src/misc1.c @@ -10135,6 +10135,15 @@ expand_path_option(curdir, gap) if (ga_grow(gap, 1) == FAIL) break; + +# if defined(MSWIN) || defined(MSDOS) + /* Avoid the path ending in a backslash, it fails when a comma is + * appended. */ + len = STRLEN(buf); + if (buf[len - 1] == '\\') + buf[len - 1] = '/'; +# endif + p = vim_strsave(buf); if (p == NULL) break; diff --git a/src/testdir/test73.in b/src/testdir/test73.in index 5472247e74..666e4d2e50 100644 --- a/src/testdir/test73.in +++ b/src/testdir/test73.in @@ -158,6 +158,16 @@ SVoyager 2:w :" Find the file containing 'E.T.' in the Xfind/in/path directory :find file :exec "w >>" . test_out +:" +:" Test that completion works when path=.,, +:" +:set path=.,, +:" Open Jimmy Hoffa file +:e in/file.txt +:exec "w >>" . test_out +:" Search for the file containing Holy Grail in same directory as in/path.txt +:find stu +:exec "w >>" . test_out :q :exec "cd " . cwd :call DeleteDirectory("Xfind") diff --git a/src/testdir/test73.ok b/src/testdir/test73.ok index 366f951630..90efab756f 100644 --- a/src/testdir/test73.ok +++ b/src/testdir/test73.ok @@ -17,3 +17,5 @@ Voyager 1 Voyager 2 Jimmy Hoffa E.T. +Jimmy Hoffa +Another Holy Grail diff --git a/src/version.c b/src/version.c index 3450db4a91..aaa8fa794b 100644 --- a/src/version.c +++ b/src/version.c @@ -729,6 +729,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 917, +/**/ 916, /**/ 915, |