updated for version 7.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)

diff --git a/src/misc1.c b/src/misc1.c
index 96d268d49db6d3322f3f51d0a7c09c5ffdf9f440..789aad373b225130aa2d95b72c25656d649533c0 100644 (file)
--- 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 5472247e7476ff584a195cb67eb7745f7dcd25c2..666e4d2e50d0ffc20ab2917badb723e624b230bf 100644 (file)
--- a/src/testdir/test73.in
+++ b/src/testdir/test73.in
@@ -158,6 +158,16 @@ SVoyager 2\e: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 366f951630a6fd9245cf901a1c3072cc61f51ec8..90efab756f14ea91967f6852cf62c7ad6aefa6ef 100644 (file)
--- 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 3450db4a918d0d1290bb63bc9e91927c0560ee8f..aaa8fa794b974e87c456bd1b9563885bfe8dcda1 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -728,6 +728,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    917,
 /**/
     916,
 /**/