Skip to content

Commit 219df23

Browse files
committed
Remove X11 Make
References #274
1 parent ce4e076 commit 219df23

File tree

2 files changed

+5
-10
lines changed

2 files changed

+5
-10
lines changed

autoload/dispatch/x11.vim

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ function! dispatch#x11#handle(request) abort
99
if $DISPLAY !~# '^:'
1010
return 0
1111
endif
12-
if (get(a:request, 'background', 0) || a:request.action ==# 'make') &&
12+
if get(a:request, 'background') &&
1313
\ (!v:windowid || !executable('wmctrl'))
1414
return 0
1515
endif
@@ -22,12 +22,7 @@ function! dispatch#x11#handle(request) abort
2222
else
2323
return 0
2424
endif
25-
if a:request.action ==# 'make'
26-
if !get(a:request, 'background', 0) && !dispatch#has_callback()
27-
return 0
28-
endif
29-
return dispatch#x11#spawn(terminal, dispatch#prepare_make(a:request), a:request)
30-
elseif a:request.action ==# 'start'
25+
if a:request.action ==# 'start'
3126
return dispatch#x11#spawn(terminal, dispatch#prepare_start(a:request), a:request)
3227
else
3328
return 0
@@ -36,7 +31,7 @@ endfunction
3631

3732
function! dispatch#x11#spawn(terminal, command, request) abort
3833
let command = dispatch#set_title(a:request) . '; ' . a:command
39-
if a:request.background || a:request.action ==# 'make'
34+
if a:request.background
4035
let command = 'wmctrl -i -a '.v:windowid . ';' . command
4136
endif
4237
call system(a:terminal . ' ' . dispatch#shellescape(&shell, &shellcmdflag, command). ' &')

doc/dispatch.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -206,8 +206,8 @@ or if Vim is running in iTerm itself.
206206
X11 ~
207207

208208
Uses g:dispatch_terminal_exec, "$TERMINAL -e", or "xterm -e". Used only for
209-
foreground |:Start| unless wmctrl is installed (which is used to switch the
210-
focus back to Vim).
209+
|:Start|. Background invocations require wmctrl to be is installed (which is
210+
used to switch the focus back to Vim).
211211

212212
Headless ~
213213

0 commit comments

Comments
 (0)