summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2018-02-03 15:43:15 +0100
committerBram Moolenaar <Bram@vim.org>2018-02-03 15:43:15 +0100
commit8fd2ffc530f8f01afac53903e6ff95867afd94d7 (patch)
tree3d2f214a1486524767c31d68676d58c53c73bcbc
parent8dce6c54c81f13582617db3127071b3436b8163b (diff)
downloadvim-git-8fd2ffc530f8f01afac53903e6ff95867afd94d7.tar.gz
patch 8.0.1457: clojure now supports a shebang linev8.0.1457
Problem: Clojure now supports a shebang line. Solution: Detect clojure script from the shebang line. (David Burgin, closes #2570)
-rw-r--r--runtime/scripts.vim10
-rw-r--r--src/version.c2
2 files changed, 11 insertions, 1 deletions
diff --git a/runtime/scripts.vim b/runtime/scripts.vim
index 71e3f48bd..fe05d265b 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: 2017 Nov 11
+" Last change: 2018 Feb 03
" 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
@@ -104,6 +104,10 @@ if s:line1 =~# "^#!"
elseif s:name =~# '^pike\%(\>\|[0-9]\)'
set ft=pike
+ " Pike
+ elseif s:name =~# '^pike\%(\>\|[0-9]\)'
+ set ft=pike
+
" Lua
elseif s:name =~# 'lua'
set ft=lua
@@ -176,6 +180,10 @@ if s:line1 =~# "^#!"
elseif s:name =~# 'scala\>'
set ft=scala
+ " Clojure
+ elseif s:name =~# 'clojure'
+ set ft=clojure
+
endif
unlet s:name
diff --git a/src/version.c b/src/version.c
index bb4379607..c73d20f98 100644
--- a/src/version.c
+++ b/src/version.c
@@ -772,6 +772,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1457,
+/**/
1456,
/**/
1455,