aboutsummaryrefslogtreecommitdiff
path: root/runtime/scripts.vim
diff options
context:
space:
mode:
authorJustin M. Keyes <justinkz@gmail.com>2017-11-06 11:22:55 +0100
committerGitHub <noreply@github.com>2017-11-06 11:22:55 +0100
commit946c2a8ee85830c543e389724575ae531e89b170 (patch)
tree23aa73c016b3f3941917605cd1742dfe8ca7e1fd /runtime/scripts.vim
parent8f03014e8861df7f49bf4e1dbdfcc20e1611ce35 (diff)
parentc348f84f218434580209a2c52552ba8fbbf1864b (diff)
downloadrneovim-946c2a8ee85830c543e389724575ae531e89b170.tar.gz
rneovim-946c2a8ee85830c543e389724575ae531e89b170.tar.bz2
rneovim-946c2a8ee85830c543e389724575ae531e89b170.zip
Merge #7491 'vim-patch: runtime'
Diffstat (limited to 'runtime/scripts.vim')
-rw-r--r--runtime/scripts.vim14
1 files changed, 13 insertions, 1 deletions
diff --git a/runtime/scripts.vim b/runtime/scripts.vim
index c2f6d5cff1..3b6163f9c2 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 Mar 04
" 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