diff options
| author | James McCoy <jamessan@jamessan.com> | 2016-06-03 22:18:40 -0500 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2016-06-03 23:18:40 -0400 |
| commit | 667c1dc4de99f7671f887e187d865206fd2c3b6d (patch) | |
| tree | 1b7e72790865573240efb3702bb2a02e7fafb1d0 /src | |
| parent | 2d9c7dd8404f3eb8c20653309bae5ddf60e5201b (diff) | |
| download | rneovim-667c1dc4de99f7671f887e187d865206fd2c3b6d.tar.gz rneovim-667c1dc4de99f7671f887e187d865206fd2c3b6d.tar.bz2 rneovim-667c1dc4de99f7671f887e187d865206fd2c3b6d.zip | |
vim-patch:7.4.1108 (#4872)
Problem: Expanding "~" halfway a file name.
Solution: Handle the file name as one name. (Marco Hinz) Add a test.
Closes vim/vim#564.
https://github.com/vim/vim/commit/58adb14739fa240ca6020cede9ab1f1cb07bd90a
Diffstat (limited to 'src')
| -rw-r--r-- | src/nvim/file_search.c | 2 | ||||
| -rw-r--r-- | src/nvim/version.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/nvim/file_search.c b/src/nvim/file_search.c index beefc4238e..f7555c99fa 100644 --- a/src/nvim/file_search.c +++ b/src/nvim/file_search.c @@ -1378,7 +1378,7 @@ find_file_in_path_option ( /* copy file name into NameBuff, expanding environment variables */ save_char = ptr[len]; ptr[len] = NUL; - expand_env(ptr, NameBuff, MAXPATHL); + expand_env_esc(ptr, NameBuff, MAXPATHL, false, true, NULL); ptr[len] = save_char; xfree(ff_file_to_find); diff --git a/src/nvim/version.c b/src/nvim/version.c index 5c3e761225..0f51f4af6e 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -585,7 +585,7 @@ static int included_patches[] = { // 1111, 1110, // 1109 NA - // 1108, + 1108, 1107, // 1106 NA 1105, |