patch 9.1.1019: filetype: fd ignore files are not recognized

Problem:  filetype: fd ignore files are not recognized
Solution: detect .fdignore files as gitignore filetype

closes: #16444

Signed-off-by: Wu, Zhenyu <wuzhenyu@ustc.edu>
Signed-off-by: Christian Brabandt <cb@256bit.org>

diff --git a/runtime/filetype.vim b/runtime/filetype.vim
index c4d32398f00af8346e4a9dd906e487cbd7a8aae8..095114ed39a85ed06bb06c8f11f4a4285b50bc42 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 Jan 08
+" Last Change: 2025 Jan 15
 " Former Maintainer:   Bram Moolenaar <Bram@vim.org>
 
 " Listen very carefully, I will say this only once
@@ -951,7 +951,9 @@ au BufNewFile,BufRead */.config/git/attributes                      setf gitattributes
 au BufNewFile,BufRead */etc/gitattributes                      setf gitattributes
 au BufNewFile,BufRead .gitignore,*.git/info/exclude            setf gitignore
 au BufNewFile,BufRead */.config/git/ignore,*.prettierignore    setf gitignore
-au BufNewFile,BufRead .rgignore,.ignore,.dockerignore,.npmignore,.vscodeignore setf gitignore
+au BufNewFile,BufRead */.config/fd/ignore,.fdignore,.ignore    setf gitignore
+au BufNewFile,BufRead .rgignore,.dockerignore                  setf gitignore
+au BufNewFile,BufRead .npmignore,.vscodeignore                 setf gitignore
 au BufNewFile,BufRead git-rebase-todo                          setf gitrebase
 au BufRead,BufNewFile .gitsendemail.msg.??????                 setf gitsendemail
 au BufNewFile,BufRead *.git/*

diff --git a/src/testdir/test_filetype.vim b/src/testdir/test_filetype.vim
index 3a6306f6f6642e8dd350d022c2afb0108e12b0df..1a54db995524e196c2bf20ed0faf0cb0910d96fd 100644 (file)
--- a/src/testdir/test_filetype.vim
+++ b/src/testdir/test_filetype.vim
@@ -309,7 +309,7 @@ def s:GetFilenameChecks(): dict<list<string>>
     gitattributes: ['file.git/info/attributes', '.gitattributes', '/.config/git/attributes', '/etc/gitattributes', '/usr/local/etc/gitattributes', 'some.git/info/attributes'] + WhenConfigHome('$XDG_CONFIG_HOME/git/attributes'),
     gitcommit: ['COMMIT_EDITMSG', 'MERGE_MSG', 'TAG_EDITMSG', 'NOTES_EDITMSG', 'EDIT_DESCRIPTION'],
     gitconfig: ['file.git/config', 'file.git/config.worktree', 'file.git/worktrees/x/config.worktree', '.gitconfig', '.gitmodules', 'file.git/modules//config', '/.config/git/config', '/etc/gitconfig', '/usr/local/etc/gitconfig', '/etc/gitconfig.d/file', 'any/etc/gitconfig.d/file', '/.gitconfig.d/file', 'any/.config/git/config', 'any/.gitconfig.d/file', 'some.git/config', 'some.git/modules/any/config'] + WhenConfigHome('$XDG_CONFIG_HOME/git/config'),
-    gitignore: ['file.git/info/exclude', '.gitignore', '/.config/git/ignore', 'some.git/info/exclude'] + WhenConfigHome('$XDG_CONFIG_HOME/git/ignore') + ['.prettierignore', '.rgignore', '.ignore', '.dockerignore', '.npmignore', '.vscodeignore'],
+    gitignore: ['file.git/info/exclude', '.gitignore', '/.config/git/ignore', 'some.git/info/exclude'] + WhenConfigHome('$XDG_CONFIG_HOME/git/ignore') + ['.prettierignore', '.fdignore', '/.config/fd/ignore', '.ignore', '.rgignore', '.dockerignore', '.npmignore', '.vscodeignore'],
     gitolite: ['gitolite.conf', '/gitolite-admin/conf/file', 'any/gitolite-admin/conf/file'],
     gitrebase: ['git-rebase-todo'],
     gitsendemail: ['.gitsendemail.msg.xxxxxx'],

diff --git a/src/version.c b/src/version.c
index 51635c7b57033dd5672ea68717fc0ed5a3fd3ca4..7ce1a98ef5325146229901549ff1fada8c8058b7 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -704,6 +704,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1019,
 /**/
     1018,
 /**/