patch 9.1.2034: filetype: Fennel fnml files are not recognized

Problem:  filetype: Fennel fnml files are not recognized
          (Alexei Mozaidze)
Solution: Detect *.fnml files as fennel filetype

Reference:
- https://fennel-lang.org/changelog#160--2025-10-13

fixes: #19047

Signed-off-by: Christian Brabandt <cb@256bit.org>

diff --git a/runtime/autoload/dist/ft.vim b/runtime/autoload/dist/ft.vim
index a81768bbde28aefefb6fd8a107d3e7b5b4a0ba80..c38671a3a4c0eecebbb89ef09bd2f60a5921db02 100644 (file)
--- a/runtime/autoload/dist/ft.vim
+++ b/runtime/autoload/dist/ft.vim
@@ -3,7 +3,7 @@ vim9script
 # Vim functions for file type detection
 #
 # Maintainer:          The Vim Project <https://github.com/vim/vim>
-# Last Change:         2025 Dec 27
+# Last Change:         2025 Dec 31
 # Former Maintainer:   Bram Moolenaar <Bram@vim.org>
 
 # These functions are moved here from runtime/filetype.vim to make startup
@@ -1876,6 +1876,9 @@ const ft_from_ext = {
   "elv": "elvish",
   # Faust
   "lib": "faust",
+  # Fennel
+  "fnl": "fennel",
+  "fnml": "fennel",
   # Libreoffice config files
   "xcu": "xml",
   "xlb": "xml",

diff --git a/runtime/filetype.vim b/runtime/filetype.vim
index c375db3c51fa9e7357c568d9a9ac2dcd52083d1a..11491dfc8d1321c59805b57d09d4f320e0929fad 100644 (file)
--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
@@ -1,7 +1,7 @@
 " Vim support file to detect file types
 "
 " Maintainer:          The Vim Project <https://github.com/vim/vim>
-" Last Change:         2025 Nov 11
+" Last Change:         2025 Dec 31
 " Former Maintainer:   Bram Moolenaar <Bram@vim.org>
 
 " If the filetype can be detected from extension or file name(the final path component),
@@ -435,7 +435,7 @@ au BufNewFile,BufRead *.app                 call dist#ft#FTapp()
 au BufNewFile,BufRead *esmtprc                 setf esmtprc
 
 " Fennel
-au BufNewFile,BufRead *.fnl,{,.}fennelrc       setf fennel
+au BufNewFile,BufRead {,.}fennelrc     setf fennel
 
 " Flatpak config
 au BufNewFile,BufRead */flatpak/repo/config    setf dosini

diff --git a/src/testdir/test_filetype.vim b/src/testdir/test_filetype.vim
index cdf854bdd1a001070803787734f293625d5e597b..700ffe846b54b1efe02934029af9c1a7aca358ef 100644 (file)
--- a/src/testdir/test_filetype.vim
+++ b/src/testdir/test_filetype.vim
@@ -292,7 +292,7 @@ def s:GetFilenameChecks(): dict<list<string>>
     falcon: ['file.fal'],
     fan: ['file.fan', 'file.fwt'],
     faust: ['file.dsp', 'file.lib'],
-    fennel: ['file.fnl', '.fennelrc', 'fennelrc'],
+    fennel: ['file.fnl', '.fennelrc', 'fennelrc', 'file.fnml'],
     fetchmail: ['.fetchmailrc'],
     fga: ['file.fga'],
     fgl: ['file.4gl', 'file.4gh', 'file.m4gl'],

diff --git a/src/version.c b/src/version.c
index 63ad85bc597c2e78bf426ff769daa97838bfd0f1..0dbd5795ee8286ce5a9739b7ccb5af9e9d559b64 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -734,6 +734,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    2034,
 /**/
     2033,
 /**/