m-vim_plugins/vim-fugitive
1
0
Fork 0
mirror of https://github.com/tpope/vim-fugitive.git synced 2025-11-09 12:03:47 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Respect environment variable overrides when opening terminal

Browse Source
This commit is contained in:
Tim Pope
2021-08-17 16:57:11 -04:00
parent f047d8250d
commit 2039676d97
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
autoload/fugitive.vim
View File

@@ -3295,12 +3295,17 @@ function! fugitive#Command(line1, line2, range, bang, mods, arg) abort
\ type(pager) == type('')) && pager isnot# 1 \ type(pager) == type('')) && pager isnot# 1
let mods = substitute(s:Mods(a:mods), '\<tab\>', '-tab', 'g') let mods = substitute(s:Mods(a:mods), '\<tab\>', '-tab', 'g')
let assign = len(dir) ? '|let b:git_dir = ' . string(dir) : '' let assign = len(dir) ? '|let b:git_dir = ' . string(dir) : ''
let argv = s:UserCommandList(options) + args
let term_opts = len(env) ? {'env': env} : {}
if has('nvim') if has('nvim')
call fugitive#Autowrite() call fugitive#Autowrite()
return mods . (a:line2 ? 'new' : 'enew') . '|call termopen(' . string(s:UserCommandList(options) + args) . ')' . assign . '|startinsert' . after return mods . (a:line2 ? 'new' : 'enew') . '|call termopen(' . string(argv) . ', ' . string(term_opts) . ')' . assign . '|startinsert' . after
elseif has('terminal') elseif exists('*term_start')
call fugitive#Autowrite() call fugitive#Autowrite()
return 'exe ' . string(mods . 'terminal ' . (a:line2 ? '' : '++curwin ') . join(map(s:UserCommandList(options) + args, 's:fnameescape(v:val)'))) . assign . after if !a:line2
let term_opts.curwin = 1
endif
return mods . 'call term_start(' . string(argv) . ', ' . string(term_opts) . ')' . assign . after
endif endif
endif endif
if pager is# 1 && editcmd ==# 'read' if pager is# 1 && editcmd ==# 'read'