From 402115f1c2b4d0704a822206f2e6e931e721c129 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Fri, 22 Jan 2021 20:55:04 +0100 Subject: patch 8.2.2392: fennel filetype not recognized Problem: Fennel filetype not recognized. Solution: Detect with pattern and hashbang. (Chinmay Dalal, closes #7729) --- runtime/filetype.vim | 3 +++ runtime/scripts.vim | 4 ++++ src/testdir/test_filetype.vim | 2 ++ src/version.c | 2 ++ 4 files changed, 11 insertions(+) diff --git a/runtime/filetype.vim b/runtime/filetype.vim index c9c9fdf715..1e365ec081 100644 --- 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 9217b4416a..6448c542cb 100644 --- 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 4e6d4331a3..2d667a297a 100644 --- 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 6bcd0747de..c5fdf85855 100644 --- 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, /**/ -- cgit v1.2.3