diff options
| -rw-r--r-- | plugin/fzf.vim | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/plugin/fzf.vim b/plugin/fzf.vim index e1a5d3da..59b030fd 100644 --- a/plugin/fzf.vim +++ b/plugin/fzf.vim @@ -236,9 +236,13 @@ function! s:common_sink(action, lines) abort endif try let empty = empty(s:fzf_expand('%')) && line('$') == 1 && empty(getline(1)) && !&modified - let autochdir = &autochdir - set noautochdir + " Preserve the current working directory in case it's changed during + " the execution (e.g. `set autochdir` or `autocmd BufEnter * lcd ...`) + let cwd = exists('w:fzf_pushd') ? w:fzf_pushd.dir : expand('%:p:h') for item in a:lines + if item[0] != '~' && item !~ (s:is_win ? '^[A-Z]:\' : '^/') + let item = join([cwd, item], (s:is_win ? '\' : '/')) + endif if empty execute 'e' s:escape(item) let empty = 0 @@ -252,7 +256,6 @@ function! s:common_sink(action, lines) abort endfor catch /^Vim:Interrupt$/ finally - let &autochdir = autochdir silent! autocmd! fzf_swap endtry endfunction |