diff options
| author | Bram Moolenaar <Bram@vim.org> | 2016-08-26 19:52:37 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2016-08-26 19:52:37 +0200 |
| commit | e4a3bcf28d92d0bde9ca227ccb40d401038185e5 (patch) | |
| tree | 276387ac4364fdee74b72c2503fc4505e8728043 /runtime/filetype.vim | |
| parent | dd74ab9b464f3d1a5f6f6395469b76f8e0e6dccd (diff) | |
| download | vim-git-e4a3bcf28d92d0bde9ca227ccb40d401038185e5.tar.gz | |
Updated runtime files. Add Scala files.
Diffstat (limited to 'runtime/filetype.vim')
| -rw-r--r-- | runtime/filetype.vim | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/runtime/filetype.vim b/runtime/filetype.vim index e46ad515c..4fc42753c 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 Aug 18 +" Last Change: 2016 Aug 26 " Listen very carefully, I will say this only once if exists("did_load_filetypes") @@ -692,8 +692,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 @@ -1780,6 +1780,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 @@ -2052,7 +2055,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 +2304,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 |