patch 8.0.1464: completing directory after :find does not add slash

Problem:    Completing directory after :find does not add slash.
Solution:   Adjust the flags for globpath(). (Genki Sky)

diff --git a/src/misc1.c b/src/misc1.c
index 2d635d677faafe35b1764d492388fd62f8a2d691..726500a4c8ff9dfcd1d6ef9bfad86b43a979b7ef 100644 (file)
--- a/src/misc1.c
+++ b/src/misc1.c
@@ -10761,6 +10761,7 @@ expand_in_path(
     char_u     *curdir;
     garray_T   path_ga;
     char_u     *paths = NULL;
+    int                glob_flags = 0;
 
     if ((curdir = alloc((unsigned)MAXPATHL)) == NULL)
        return 0;
@@ -10777,7 +10778,11 @@ expand_in_path(
     if (paths == NULL)
        return 0;
 
-    globpath(paths, pattern, gap, (flags & EW_ICASE) ? WILD_ICASE : 0);
+    if (flags & EW_ICASE)
+       glob_flags |= WILD_ICASE;
+    if (flags & EW_ADDSLASH)
+       glob_flags |= WILD_ADD_SLASH;
+    globpath(paths, pattern, gap, glob_flags);
     vim_free(paths);
 
     return gap->ga_len;

diff --git a/src/testdir/test_find_complete.vim b/src/testdir/test_find_complete.vim
index 4732109ed0cf746cd3de4698c7dc5b244b9dd189..a7bc135d4750edeeb67e37514bbda1ce4606826f 100644 (file)
--- a/src/testdir/test_find_complete.vim
+++ b/src/testdir/test_find_complete.vim
@@ -86,6 +86,12 @@ func Test_find_complete()
   call feedkeys(":find f\t\n", "xt")
   call assert_equal('Holy Grail', getline(1))
 
+  " Test that find completion on directory appends a slash
+  call feedkeys(":find in/pa\tfile.txt\n", "xt")
+  call assert_equal('E.T.', getline(1))
+  call feedkeys(":find ./i\tstuff.txt\n", "xt")
+  call assert_equal('Another Holy Grail', getline(1))
+
   " Test shortening of
   "
   "    foo/x/bar/voyager.txt

diff --git a/src/version.c b/src/version.c
index af192797f7255f83809ca968b75ad8f2f6436b11..811d5210548c0584a9c9839bae67e459f4681fb8 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -771,6 +771,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1464,
 /**/
     1463,
 /**/