diff --git a/runtime/autoload/dist/ft.vim b/runtime/autoload/dist/ft.vim index 4aa5ce0542..0ab087b0f5 100644 --- 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 -# Last Change: 2025 Dec 22 +# Last Change: 2025 Dec 26 # Former Maintainer: Bram Moolenaar # These functions are moved here from runtime/filetype.vim to make startup @@ -1976,6 +1976,8 @@ const ft_from_ext = { "fish": "fish", # Flix "flix": "flix", + # Fluent + "ftl": "fluent", # Focus Executable "fex": "focexec", "focexec": "focexec", diff --git a/src/testdir/test_filetype.vim b/src/testdir/test_filetype.vim index ee6f6c9ec1..b3e6fc1719 100644 --- a/src/testdir/test_filetype.vim +++ b/src/testdir/test_filetype.vim @@ -298,6 +298,7 @@ def s:GetFilenameChecks(): dict> firrtl: ['file.fir'], fish: ['file.fish'], flix: ['file.flix'], + fluent: ['file.ftl'], focexec: ['file.fex', 'file.focexec'], form: ['file.frm'], forth: ['file.ft', 'file.fth', 'file.4th'], diff --git a/src/version.c b/src/version.c index 82e85a94d4..00146a0a52 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 */ +/**/ + 2021, /**/ 2020, /**/