diff options
Diffstat (limited to 'ftdetect')
| -rw-r--r-- | ftdetect/polyglot.vim | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/ftdetect/polyglot.vim b/ftdetect/polyglot.vim index abadf073..4659caaf 100644 --- a/ftdetect/polyglot.vim +++ b/ftdetect/polyglot.vim @@ -157,14 +157,14 @@ if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'go') == -1 let s:current_fileformats = '' let s:current_fileencodings = '' function! s:gofiletype_pre(type) - let s:current_fileformats = &g:fileformats - let s:current_fileencodings = &g:fileencodings - set fileencodings=utf-8 fileformats=unix - let &l:filetype = a:type + let s:current_fileformats = &g:fileformats + let s:current_fileencodings = &g:fileencodings + set fileencodings=utf-8 fileformats=unix + let &l:filetype = a:type endfunction function! s:gofiletype_post() - let &g:fileformats = s:current_fileformats - let &g:fileencodings = s:current_fileencodings + let &g:fileformats = s:current_fileformats + let &g:fileencodings = s:current_fileencodings endfunction au BufNewFile *.go setfiletype go | setlocal fileencoding=utf-8 fileformat=unix au BufRead *.go call s:gofiletype_pre("go") @@ -436,7 +436,7 @@ au BufNewFile,BufRead .pryrc call s:setf('ruby') au BufNewFile,BufRead Puppetfile call s:setf('ruby') au BufNewFile,BufRead *.rabl call s:setf('ruby') au BufNewFile,BufRead [rR]outefile call s:setf('ruby') -au BufNewFile,BufRead .simplecov call s:setf('ruby) +au BufNewFile,BufRead .simplecov call s:setf('ruby') au BufNewFile,BufRead [tT]horfile,*.thor call s:setf('ruby') au BufNewFile,BufRead [vV]agrantfile call s:setf('ruby') endif @@ -507,8 +507,7 @@ au BufNewFile,BufRead *.thrift setlocal filetype=thrift endif if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'tmux') == -1 -autocmd BufNewFile,BufRead {.,}tmux.conf{.*,} setlocal filetype=tmux -autocmd BufNewFile,BufRead {.,}tmux.conf{.*,} setlocal commentstring=#\ %s +autocmd BufNewFile,BufRead {.,}tmux*.conf* setfiletype tmux endif if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'toml') == -1 |