twin/fzf
1
0
Fork 0
mirror of https://github.com/junegunn/fzf.git synced 2025-05-19 12:50:22 -07:00
Code Issues Packages Projects Releases Wiki Activity

[vim] Fix issues with other plugins changing working directory

Browse Source 
Close #1005
This commit is contained in:
Junegunn Choi 2017-08-09 01:54:01 +09:00
parent 999d374f0c
commit 462c68b625
No known key found for this signature in database
GPG Key ID: 254BC280FEF9C627
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
plugin/fzf.vim
View File

@ -466,11 +466,11 @@ augroup fzf_popd
augroup END augroup END
function! s:dopopd() function! s:dopopd()
if !exists('w:fzf_prev_dir') || exists('*haslocaldir') && !haslocaldir() if !exists('w:fzf_dir') || s:fzf_getcwd() != w:fzf_dir[1]
return return
endif endif
execute 'lcd' s:escape(w:fzf_prev_dir) execute 'lcd' s:escape(w:fzf_dir[0])
unlet w:fzf_prev_dir unlet w:fzf_dir
endfunction endfunction
function! s:xterm_launcher() function! s:xterm_launcher()
@ -719,7 +719,7 @@ function! s:callback(dict, lines) abort
let popd = has_key(a:dict, 'prev_dir') && let popd = has_key(a:dict, 'prev_dir') &&
\ (!&autochdir || (empty(a:lines) || len(a:lines) == 1 && empty(a:lines[0]))) \ (!&autochdir || (empty(a:lines) || len(a:lines) == 1 && empty(a:lines[0])))
if popd if popd
let w:fzf_prev_dir = a:dict.prev_dir let w:fzf_dir = [a:dict.prev_dir, a:dict.dir]
endif endif
try try
@ -743,7 +743,7 @@ function! s:callback(dict, lines) abort
" We may have opened a new window or tab " We may have opened a new window or tab
if popd if popd
let w:fzf_prev_dir = a:dict.prev_dir let w:fzf_dir = [a:dict.prev_dir, a:dict.dir]
call s:dopopd() call s:dopopd()
endif endif
endfunction endfunction