vim/nerdtree
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #801 from mrubli/focus-on-close

Browse Source 
Fix focussing previous buffer when closing NERDTree
This commit is contained in:
Phil Runninger 2018-02-02 09:19:53 -05:00 committed by GitHub
commit e47e588705
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lib/nerdtree/nerdtree.vim
View File

@ -38,17 +38,26 @@ function! s:NERDTree.Close()
endif endif
if winnr("$") != 1 if winnr("$") != 1
" Use the window ID to identify the currently active window or fall
" back on the buffer ID if win_getid/win_gotoid are not available, in
" which case we'll focus an arbitrary window showing the buffer.
let l:useWinId = exists('*win_getid') && exists('*win_gotoid')
if winnr() == s:NERDTree.GetWinNum() if winnr() == s:NERDTree.GetWinNum()
call nerdtree#exec("wincmd p") call nerdtree#exec("wincmd p")
let bufnr = bufnr("") let l:activeBufOrWin = l:useWinId ? win_getid() : bufnr("")
call nerdtree#exec("wincmd p") call nerdtree#exec("wincmd p")
else else
let bufnr = bufnr("") let l:activeBufOrWin = l:useWinId ? win_getid() : bufnr("")
endif endif
call nerdtree#exec(s:NERDTree.GetWinNum() . " wincmd w") call nerdtree#exec(s:NERDTree.GetWinNum() . " wincmd w")
close close
call nerdtree#exec(bufwinnr(bufnr) . " wincmd w") if l:useWinId
call nerdtree#exec("call win_gotoid(" . l:activeBufOrWin . ")")
else
call nerdtree#exec(bufwinnr(l:activeBufOrWin) . " wincmd w")
endif
else else
close close
endif endif