Skip to content

Commit 71499a6

Browse files
committed
Work around zshenv dependent on $SHELL
References #94.
1 parent 24be951 commit 71499a6

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

autoload/dispatch.vim

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -131,10 +131,11 @@ function! dispatch#set_title(request) abort
131131
endfunction
132132

133133
function! dispatch#isolate(keep, ...) abort
134+
let keep = ['SHELL'] + a:keep
134135
let command = ['cd ' . shellescape(getcwd())]
135136
for line in split(system('env'), "\n")
136137
let var = matchstr(line, '^\w\+\ze=')
137-
if !empty(var) && var !=# '_' && index(a:keep, var) < 0
138+
if !empty(var) && var !=# '_' && index(keep, var) < 0
138139
if &shell =~# 'csh'
139140
let command += split('setenv '.var.' '.shellescape(eval('$'.var)), "\n")
140141
else
@@ -145,7 +146,7 @@ function! dispatch#isolate(keep, ...) abort
145146
let command += a:000
146147
let temp = tempname()
147148
call writefile(command, temp)
148-
return 'env -i ' . join(map(copy(a:keep), 'v:val."=\"$". v:val ."\" "'), '') . &shell . ' ' . temp
149+
return 'env -i ' . join(map(copy(keep), 'v:val."=\"$". v:val ."\" "'), '') . &shell . ' ' . temp
149150
endfunction
150151

151152
function! s:current_compiler() abort

0 commit comments

Comments
 (0)