Skip to content

Commit e292d2c

Browse files
committed
Simplify nested try block
1 parent 4d40dec commit e292d2c

File tree

1 file changed

+6
-9
lines changed

1 file changed

+6
-9
lines changed

autoload/dispatch.vim

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -642,7 +642,9 @@ function! s:cgetfile(request, all, copen) abort
642642
let compiler = get(b:, 'current_compiler', '')
643643
let cd = haslocaldir() ? 'lcd' : 'cd'
644644
let dir = getcwd()
645+
let modelines = &modelines
645646
try
647+
let &modelines = 0
646648
call s:set_current_compiler(get(request, 'compiler', ''))
647649
exe cd fnameescape(request.directory)
648650
if a:all
@@ -651,18 +653,13 @@ function! s:cgetfile(request, all, copen) abort
651653
let &l:efm = request.format
652654
endif
653655
let &l:makeprg = request.command
654-
let modelines = &modelines
655-
try
656-
let &modelines = 0
657-
silent doautocmd QuickFixCmdPre cgetfile
658-
execute 'cgetfile '.fnameescape(request.file)
659-
silent doautocmd QuickFixCmdPost cgetfile
660-
finally
661-
let &modelines = modelines
662-
endtry
656+
silent doautocmd QuickFixCmdPre cgetfile
657+
execute 'cgetfile '.fnameescape(request.file)
658+
silent doautocmd QuickFixCmdPost cgetfile
663659
catch '^E40:'
664660
return v:exception
665661
finally
662+
let &modelines = modelines
666663
exe cd fnameescape(dir)
667664
let &l:efm = efm
668665
let &l:makeprg = makeprg

0 commit comments

Comments
 (0)