patch 8.2.2392: fennel filetype not recognized

Problem:    Fennel filetype not recognized.
Solution:   Detect with pattern and hashbang. (Chinmay Dalal, closes #7729)

diff --git a/runtime/filetype.vim b/runtime/filetype.vim
index c9c9fdf715662b981902ae602b4912fcba7e7c22..1e365ec0811f56cea959ba7497c51d6d46ae6fb9 100644 (file)
--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
@@ -589,6 +589,9 @@ au BufNewFile,BufRead *.fan,*.fwt           setf fan
 " Factor
 au BufNewFile,BufRead *.factor                 setf factor
 
+" Fennel
+autocmd BufRead,BufNewFile *.fnl               setf fennel
+
 " Fetchmail RC file
 au BufNewFile,BufRead .fetchmailrc             setf fetchmail
 

diff --git a/runtime/scripts.vim b/runtime/scripts.vim
index 9217b4416aacd07758a12fe087b1bc4ecd3706e0..6448c542cbee3dd034ce7e750eadba11043de382 100644 (file)
--- a/runtime/scripts.vim
+++ b/runtime/scripts.vim
@@ -186,6 +186,10 @@ if s:line1 =~# "^#!"
   elseif s:name =~# 'instantfpc\>'
     set ft=pascal
 
+    " Fennel
+  elseif s:name =~# 'fennel\>'
+    set ft=fennel
+
   endif
   unlet s:name
 

diff --git a/src/testdir/test_filetype.vim b/src/testdir/test_filetype.vim
index 4e6d4331a33eae2c1c70e7ecbaa1289bdfe1256f..2d667a297a63966c655176762878e58ba15f6ae1 100644 (file)
--- a/src/testdir/test_filetype.vim
+++ b/src/testdir/test_filetype.vim
@@ -174,6 +174,7 @@ let s:filename_checks = {
     \ 'factor': ['file.factor'],
     \ 'falcon': ['file.fal'],
     \ 'fan': ['file.fan', 'file.fwt'],
+    \ 'fennel': ['file.fnl'],
     \ 'fetchmail': ['.fetchmailrc'],
     \ 'fgl': ['file.4gl', 'file.4gh', 'file.m4gl'],
     \ 'focexec': ['file.fex', 'file.focexec'],
@@ -639,6 +640,7 @@ let s:script_checks = {
       \         ['// -*- C++ -*-']],
       \ 'yaml': [['%YAML 1.2']],
       \ 'pascal': [['#!/path/instantfpc']],
+      \ 'fennel': [['#!/path/fennel']],
       \ }
 
 " Various forms of "env" optional arguments.

diff --git a/src/version.c b/src/version.c
index 6bcd0747de5f6b4e9a3bc922fe0e5d84a8884e21..c5fdf85855733a9ec7aaf4db1edf0516b08f3355 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -750,6 +750,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    2392,
 /**/
     2391,
 /**/