Skip to content

Commit 527f200

Browse files
authored
Support compiler plugins that don't set makeprg
1 parent a58eaaa commit 527f200

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

autoload/dispatch.vim

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -868,7 +868,7 @@ function! dispatch#compile_command(bang, args, count, mods, ...) abort
868868
if executable ==# '_' || executable ==# '--'
869869
if !empty(get(request, 'compiler', ''))
870870
let compiler_options = dispatch#compiler_options(request.compiler)
871-
if !has_key(compiler_options, 'program')
871+
if !has_key(compiler_options, 'format')
872872
return 'compiler ' . dispatch#fnameescape(request.compiler)
873873
endif
874874
call extend(request, compiler_options)
@@ -878,13 +878,13 @@ function! dispatch#compile_command(bang, args, count, mods, ...) abort
878878
let request.format = &errorformat
879879
endif
880880
let request.args = s:default_args(args, exists('default_dispatch') && a:count < 0 ? 0 : a:count, request.format)
881-
let request.command = s:build_make(request.program, request.args)
881+
let request.command = s:build_make(get(request, 'program', get(request, 'compiler', '--')), request.args)
882882
else
883883
let [compiler, prefix, program, rest] = s:compiler_split(args)
884884
let request.compiler = get(request, 'compiler', compiler)
885885
if !empty(request.compiler)
886886
let compiler_options = dispatch#compiler_options(request.compiler)
887-
if !has_key(compiler_options, 'program')
887+
if !has_key(compiler_options, 'format')
888888
return 'compiler ' . dispatch#fnameescape(request.compiler)
889889
endif
890890
call extend(request, compiler_options)

0 commit comments

Comments
 (0)