Use <nomodeline> with Fugitive autocmds, and un-silent them

Closes #580.
This commit is contained in:
Daniel Hahler
2014-11-20 21:43:36 +01:00
committed by Tim Pope
parent d3b98d9886
commit 2c8461db08

View File

@@ -185,7 +185,14 @@ function! fugitive#detect(path) abort
endif endif
endif endif
if exists('b:git_dir') if exists('b:git_dir')
silent doautocmd User FugitiveBoot if exists('#User#FugitiveBoot')
try
let [save_mls, &modelines] = [&mls, 0]
doautocmd User FugitiveBoot
finally
let &mls = save_mls
endtry
endif
cnoremap <buffer> <expr> <C-R><C-G> fnameescape(<SID>recall()) cnoremap <buffer> <expr> <C-R><C-G> fnameescape(<SID>recall())
nnoremap <buffer> <silent> y<C-G> :call setreg(v:register, <SID>recall())<CR> nnoremap <buffer> <silent> y<C-G> :call setreg(v:register, <SID>recall())<CR>
let buffer = fugitive#buffer() let buffer = fugitive#buffer()
@@ -200,7 +207,12 @@ function! fugitive#detect(path) abort
call buffer.setvar('&tags', escape(b:git_dir.'/'.&filetype.'.tags', ', ').','.buffer.getvar('&tags')) call buffer.setvar('&tags', escape(b:git_dir.'/'.&filetype.'.tags', ', ').','.buffer.getvar('&tags'))
endif endif
endif endif
silent doautocmd User Fugitive try
let [save_mls, &modelines] = [&mls, 0]
doautocmd User Fugitive
finally
let &mls = save_mls
endtry
endif endif
endfunction endfunction
@@ -2506,7 +2518,9 @@ function! s:BufWriteIndexFile() abort
endif endif
if v:shell_error == 0 if v:shell_error == 0
setlocal nomodified setlocal nomodified
silent execute 'doautocmd BufWritePost '.s:fnameescape(expand('%:p')) if exists('#BufWritePost')
execute 'doautocmd BufWritePost '.s:fnameescape(expand('%:p'))
endif
call fugitive#reload_status() call fugitive#reload_status()
return '' return ''
else else