1 files changed, 8 insertions, 4 deletions
diff --git a/runtime/lua/vim/filetype.lua b/runtime/lua/vim/filetype.lua
index 819587bb3e..736ecc1ff7 100644
--- a/runtime/lua/vim/filetype.lua
+++ b/runtime/lua/vim/filetype.lua
@@ -220,7 +220,6 @@ local extension = {
   ["f08"] = "fortran",
   fpc = "fpcmake",
   fsl = "framescript",
-  bi = "freebasic",
   fb = "freebasic",
   fsi = "fsharp",
   fsx = "fsharp",
@@ -231,6 +230,7 @@ local extension = {
   gemini = "gemtext",
   gift = "gift",
   gpi = "gnuplot",
+  gnuplot = "gnuplot",
   go = "go",
   gp = "gp",
   gs = "grads",
@@ -293,6 +293,7 @@ local extension = {
   webmanifest = "json",
   ipynb = "json",
   ["json-patch"] = "json",
+  json5 = "json5",
   jsonc = "jsonc",
   jsp = "jsp",
   jl = "julia",
@@ -738,7 +739,9 @@ local extension = {
   PL = function() vim.fn["dist#ft#FTpl"]() end,
   R = function() vim.fn["dist#ft#FTr"]() end,
   asm = function() vim.fn["dist#ft#FTasm"]() end,
-  bas = function() vim.fn["dist#ft#FTVB"]("basic") end,
+  bas = function() vim.fn["dist#ft#FTbas"]() end,
+  bi = function() vim.fn["dist#ft#FTbas"]() end,
+  bm = function() vim.fn["dist#ft#FTbas"]() end,
   bash = function() vim.fn["dist#ft#SetFileTypeSH"]("bash") end,
   btm = function() vim.fn["dist#ft#FTbtm"]() end,
   c = function() vim.fn["dist#ft#FTlpc"]() end,
@@ -890,8 +893,6 @@ local filename = {
   ["EDIT_DESCRIPTION"] = "gitcommit",
   [".gitconfig"] = "gitconfig",
   [".gitmodules"] = "gitconfig",
-  ["/.config/git/config"] = "gitconfig",
-  ["/etc/gitconfig"] = "gitconfig",
   ["gitolite.conf"] = "gitolite",
   ["git-rebase-todo"] = "gitrebase",
   gkrellmrc = "gkrellmrc",
@@ -1146,7 +1147,10 @@ local pattern = {
   [".*Eterm/.*%.cfg"] = "eterm",
   [".*%.git/modules/.*/config"] = "gitconfig",
   [".*%.git/config"] = "gitconfig",
+  [".*/etc/gitconfig"] = "gitconfig",
   [".*/%.config/git/config"] = "gitconfig",
+  [".*%.git/config%.worktree"] = "gitconfig",
+  [".*%.git/worktrees/.*/config%.worktree"] = "gitconfig",
   ["%.gitsendemail%.msg%......."] = "gitsendemail",
   ["gkrellmrc_."] = "gkrellmrc",
   [".*/usr/.*/gnupg/options%.skel"] = "gpg",