diff options
| author | ZyX <kp-pav@yandex.ru> | 2017-12-03 16:49:30 +0300 |
|---|---|---|
| committer | ZyX <kp-pav@yandex.ru> | 2017-12-03 16:49:30 +0300 |
| commit | c49e22d3964d6c7ae1c24e8ad01b5fec4ca40b57 (patch) | |
| tree | b7e59c416d1435725c65f8952b6e55c70544d97e /runtime/scripts.vim | |
| parent | 62108c3b0be46936c83f6d4c98b44ceb5e6f77fd (diff) | |
| parent | 27a577586eace687c47e7398845178208cae524a (diff) | |
| download | rneovim-c49e22d3964d6c7ae1c24e8ad01b5fec4ca40b57.tar.gz rneovim-c49e22d3964d6c7ae1c24e8ad01b5fec4ca40b57.tar.bz2 rneovim-c49e22d3964d6c7ae1c24e8ad01b5fec4ca40b57.zip | |
Merge branch 'master' into s-dash-stdin
Diffstat (limited to 'runtime/scripts.vim')
| -rw-r--r-- | runtime/scripts.vim | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/runtime/scripts.vim b/runtime/scripts.vim index c2f6d5cff1..63bf9efcf9 100644 --- a/runtime/scripts.vim +++ b/runtime/scripts.vim @@ -1,7 +1,7 @@ " Vim support file to detect file types in scripts " " Maintainer: Bram Moolenaar <Bram@vim.org> -" Last change: 2016 May 21 +" Last change: 2017 Aug 27 " This file is called by an autocommand for every file that has just been " loaded into a buffer. It checks if the type of file can be recognized by @@ -124,6 +124,10 @@ if s:line1 =~ "^#!" elseif s:name =~ 'ruby' set ft=ruby + " JavaScript + elseif s:name =~ 'node\(js\)\=\>' || s:name =~ 'rhino\>' + set ft=javascript + " BC calculator elseif s:name =~ '^bc\>' set ft=bc @@ -156,6 +160,14 @@ if s:line1 =~ "^#!" elseif s:name =~ 'escript' set ft=erlang + " Haskell + elseif s:name =~ 'haskell' + set ft=haskell + + " Scala + elseif s:name =~ 'scala\>' + set ft=scala + endif unlet s:name @@ -285,7 +297,7 @@ else set ft=virata " Strace - elseif s:line1 =~ '^\(\[pid \d\+\] \)\=[0-9:.]* *execve(' || s:line1 =~ '^__libc_start_main' + elseif s:line1 =~# '[0-9:.]* *execve(' || s:line1 =~# '^__libc_start_main' set ft=strace " VSE JCL @@ -303,7 +315,7 @@ else set ft=sindacmp " DNS zone files - elseif s:line1.s:line2.s:line3.s:line4 =~ '^; <<>> DiG [0-9.]\+ <<>>\|BIND.*named\|$ORIGIN\|$TTL\|IN\s\+SOA' + elseif s:line1.s:line2.s:line3.s:line4 =~# '^; <<>> DiG [0-9.]\+.* <<>>\|$ORIGIN\|$TTL\|IN\s\+SOA' set ft=bindzone " BAAN |