aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames McCoy <jamessan@jamessan.com>2017-02-27 11:49:51 -0500
committerJames McCoy <jamessan@jamessan.com>2017-02-27 12:03:28 -0500
commiteb6651b7a936736be4b9572f7cfec1ac2f8aa07a (patch)
treee32e7cd42d57609c611c9ec085f21b2d1bf5e147
parentbe65fd88f40cc0a955b25f7ef78bd954f3986046 (diff)
downloadrneovim-eb6651b7a936736be4b9572f7cfec1ac2f8aa07a.tar.gz
rneovim-eb6651b7a936736be4b9572f7cfec1ac2f8aa07a.tar.bz2
rneovim-eb6651b7a936736be4b9572f7cfec1ac2f8aa07a.zip
vim-patch:7.4.1991
Problem: glob() does not add a symbolic link when there are no wildcards. Solution: Remove the call to mch_getperm(). https://github.com/vim/vim/commit/00efded1064427ab3f84e4d57af62e0aab876fc6
-rw-r--r--src/nvim/path.c2
-rw-r--r--src/nvim/version.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/nvim/path.c b/src/nvim/path.c
index ea06fb8dde..dfcafc85de 100644
--- a/src/nvim/path.c
+++ b/src/nvim/path.c
@@ -1225,7 +1225,7 @@ int gen_expand_wildcards(int num_pat, char_u **pat, int *num_file,
* "vim c:/" work. */
if (flags & EW_NOTFOUND) {
addfile(&ga, t, flags | EW_DIR | EW_FILE);
- } else if (os_path_exists(t)) {
+ } else {
addfile(&ga, t, flags);
}
xfree(t);
diff --git a/src/nvim/version.c b/src/nvim/version.c
index fe443ce01f..9404bae711 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -449,7 +449,7 @@ static int included_patches[] = {
// 1994,
// 1993,
// 1992,
- // 1991,
+ 1991,
1990,
1989,
// 1988 NA