@@ -423,6 +423,7 @@ function! dispatch#compile_command(bang, args, count) abort
423423 let request = {
424424 \ ' action' : ' make' ,
425425 \ ' background' : a: bang ,
426+ \ ' file' : tempname (),
426427 \ ' format' : ' %+I%.%#'
427428 \ }
428429
@@ -457,38 +458,25 @@ function! dispatch#compile_command(bang, args, count) abort
457458 endif
458459 let request.title = get (request, ' compiler' , ' make' )
459460
460- if a: args == # ' -' && ! empty (s: makes )
461- let request = copy (s: makes [-1 ])
462- unlet ! request.pid
463- unlet ! request.completed
464- unlet ! request.handler
465- endif
466-
467461 if &autowrite || &autowriteall
468462 silent ! wall
469463 endif
470464 cclose
471- let request.file = tempname ()
472465 let &errorfile = request.file
473466
474467 let efm = &l: efm
475468 let makeprg = &l: makeprg
476469 let compiler = get (b: , ' current_compiler' , ' ' )
477470 let modelines = &modelines
478471 let after = ' '
479- let cd = exists (' *haslocaldir' ) && haslocaldir () ? ' lcd' : ' cd'
480472 try
481473 let &modelines = 0
482474 call s: set_current_compiler (get (request, ' compiler' , ' ' ))
483475 let &l: efm = request.format
484476 let &l: makeprg = request.command
485477 silent doautocmd QuickFixCmdPre dispatch- make
486- let request.directory = get (request, ' directory' , getcwd ())
487- if request.directory !=# getcwd ()
488- let cwd = getcwd ()
489- execute cd fnameescape (request.directory )
490- endif
491- let request.expanded = get (request, ' expanded' , dispatch#expand (request.command ))
478+ let request.directory = getcwd ()
479+ let request.expanded = dispatch#expand (request.command )
492480 call extend (s: makes , [request])
493481 let request.id = len (s: makes )
494482 let s: files [request.file ] = request
@@ -505,9 +493,6 @@ function! dispatch#compile_command(bang, args, count) abort
505493 let &l: efm = efm
506494 let &l: makeprg = makeprg
507495 call s: set_current_compiler (compiler )
508- if exists (' cwd' )
509- execute cd fnameescape (cwd)
510- endif
511496 endtry
512497 execute after
513498 return ' '
0 commit comments