diff --git a/runtime/autoload/dist/ft.vim b/runtime/autoload/dist/ft.vim index c38671a3a4..f9c19319b7 100644 --- a/runtime/autoload/dist/ft.vim +++ b/runtime/autoload/dist/ft.vim @@ -1878,7 +1878,7 @@ const ft_from_ext = { "lib": "faust", # Fennel "fnl": "fennel", - "fnml": "fennel", + "fnlm": "fennel", # Libreoffice config files "xcu": "xml", "xlb": "xml", diff --git a/src/testdir/test_filetype.vim b/src/testdir/test_filetype.vim index 700ffe846b..300a7536f8 100644 --- a/src/testdir/test_filetype.vim +++ b/src/testdir/test_filetype.vim @@ -292,7 +292,7 @@ def s:GetFilenameChecks(): dict> falcon: ['file.fal'], fan: ['file.fan', 'file.fwt'], faust: ['file.dsp', 'file.lib'], - fennel: ['file.fnl', '.fennelrc', 'fennelrc', 'file.fnml'], + fennel: ['file.fnl', '.fennelrc', 'fennelrc', 'file.fnlm'], fetchmail: ['.fetchmailrc'], fga: ['file.fga'], fgl: ['file.4gl', 'file.4gh', 'file.m4gl'], diff --git a/src/version.c b/src/version.c index 0dbd5795ee..c04f67b90b 100644 --- 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 */ +/**/ + 2035, /**/ 2034, /**/