diff options
| author | James McCoy <jamessan@jamessan.com> | 2017-04-19 23:16:36 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-19 23:16:36 -0400 |
| commit | 2fb46adc5e19a0f85deed3983a3b956c31504adf (patch) | |
| tree | a971e87f03a42c0f8f33c7bdf481f5b3605a8795 /runtime/filetype.vim | |
| parent | 462c53eb3ea256bb85eb3916400d984347f0626f (diff) | |
| parent | b25fa94eb5234e3c5ae1f7b3c0888aac644ae923 (diff) | |
| download | rneovim-2fb46adc5e19a0f85deed3983a3b956c31504adf.tar.gz rneovim-2fb46adc5e19a0f85deed3983a3b956c31504adf.tar.bz2 rneovim-2fb46adc5e19a0f85deed3983a3b956c31504adf.zip | |
Merge pull request #6531 from justinmk/vim-dc1f1645cb49
vim-patch: runtime updates
Diffstat (limited to 'runtime/filetype.vim')
| -rw-r--r-- | runtime/filetype.vim | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/runtime/filetype.vim b/runtime/filetype.vim index f9d7f86a97..43155aa27e 100644 --- a/runtime/filetype.vim +++ b/runtime/filetype.vim @@ -1,7 +1,7 @@ " Vim support file to detect file types " " Maintainer: Bram Moolenaar <Bram@vim.org> -" Last Change: 2016 Jul 21 +" Last Change: 2016 Aug 26 " Listen very carefully, I will say this only once if exists("did_load_filetypes") @@ -688,8 +688,8 @@ func! s:FTe() let n = 1 while n < 100 && n < line("$") if getline(n) =~ "^\\s*\\(<'\\|'>\\)\\s*$" - setf specman - return + setf specman + return endif let n = n + 1 endwhile @@ -775,8 +775,7 @@ au BufNewFile,BufRead *.mo,*.gdmo setf gdmo au BufNewFile,BufRead *.ged,lltxxxxx.txt setf gedcom " Git -au BufNewFile,BufRead COMMIT_EDITMSG setf gitcommit -au BufNewFile,BufRead MERGE_MSG setf gitcommit +au BufNewFile,BufRead COMMIT_EDITMSG,MERGE_MSG,TAG_EDITMSG setf gitcommit au BufNewFile,BufRead *.git/config,.gitconfig,.gitmodules setf gitconfig au BufNewFile,BufRead *.git/modules/*/config setf gitconfig au BufNewFile,BufRead */.config/git/config setf gitconfig @@ -1777,6 +1776,9 @@ au BufNewFile,BufRead *.sass setf sass " Sather au BufNewFile,BufRead *.sa setf sather +" Scala +au BufNewFile,BufRead *.scala setf scala + " Scilab au BufNewFile,BufRead *.sci,*.sce setf scilab @@ -2049,7 +2051,7 @@ func! s:FTRules() if line =~ s:ft_rules_udev_rules_pattern let udev_rules = substitute(line, s:ft_rules_udev_rules_pattern, '\1', "") if dir == udev_rules - setf udevrules + setf udevrules endif break endif @@ -2301,7 +2303,7 @@ au BufNewFile,BufRead */etc/updatedb.conf setf updatedb au BufNewFile,BufRead */usr/share/upstart/*.conf setf upstart au BufNewFile,BufRead */usr/share/upstart/*.override setf upstart au BufNewFile,BufRead */etc/init/*.conf,*/etc/init/*.override setf upstart -au BufNewFile,BufRead */.init/*.conf,*/.init/*.override setf upstart +au BufNewFile,BufRead */.init/*.conf,*/.init/*.override setf upstart au BufNewFile,BufRead */.config/upstart/*.conf setf upstart au BufNewFile,BufRead */.config/upstart/*.override setf upstart |