Merge pull request #1296 from fatih/term-neovim-fix

term: fix cwd after running command
fatih · May 28, 2017 · b8a6dc9 · b8a6dc9
2 parents ff3c10e + 4fda596
commit b8a6dc9
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/autoload/go/term.vim b/autoload/go/term.vim
@@ -23,6 +23,7 @@ function! go#term#newmode(bang, cmd, mode) abort
   let $GOPATH = go#path#Detect()
 
   " execute go build in the files directory
+  let l:winnr = winnr()
   let cd = exists('*haslocaldir') && haslocaldir() ? 'lcd ' : 'cd '
   let dir = getcwd()
 
@@ -47,6 +48,10 @@ function! go#term#newmode(bang, cmd, mode) abort
 
   let id = termopen(a:cmd, job)
 
+  if l:winnr !=# winnr()
+    exe l:winnr . "wincmd w"
+  endif
+
   execute cd . fnameescape(dir)
 
   " restore back GOPATH