diff options
| author | James McCoy <jamessan@jamessan.com> | 2018-03-28 21:52:06 -0400 |
|---|---|---|
| committer | James McCoy <jamessan@jamessan.com> | 2018-03-28 21:54:39 -0400 |
| commit | 79f9c2d9c650ceab27cdc6707fd6d7fa1de29fc1 (patch) | |
| tree | 4e0589d75801f3ff6a9678f84f5009102766661e /runtime/scripts.vim | |
| parent | 4403864da3c48412595d439f36458d1e6ccfc49f (diff) | |
| parent | 3f3de9b1a95d273463a87516365510dbffcaf3d2 (diff) | |
| download | rneovim-79f9c2d9c650ceab27cdc6707fd6d7fa1de29fc1.tar.gz rneovim-79f9c2d9c650ceab27cdc6707fd6d7fa1de29fc1.tar.bz2 rneovim-79f9c2d9c650ceab27cdc6707fd6d7fa1de29fc1.zip | |
Merge branch 'master' into yagebu/option-fixes
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 |