From 1a2870b57aa832500d59c17c8225a64c2b4aa619 Mon Sep 17 00:00:00 2001 From: Julio B Date: Thu, 26 Sep 2024 16:22:34 +0200 Subject: [PATCH] patch 9.1.0744: filetype: notmuch configs are not recognised Problem: filetype: notmuch configs are not recognised Solution: Detect more notmuch profile configuration files as dosini filetype (Julio B) Reference: https://notmuchmail.org/doc/latest/man1/notmuch-config.html#configuration closes: #15744 Signed-off-by: Julio B Signed-off-by: Christian Brabandt --- runtime/filetype.vim | 6 +++++- src/testdir/test_filetype.vim | 3 ++- src/version.c | 2 ++ 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/runtime/filetype.vim b/runtime/filetype.vim index 9efa11df78..85412f4df0 100644 --- a/runtime/filetype.vim +++ b/runtime/filetype.vim @@ -1631,7 +1631,11 @@ au BufNewFile,BufRead *.mm call dist#ft#FTmm() au BufNewFile,BufRead *.nqc setf nqc " notmuch -au BufNewFile,BufRead .notmuch-config setf dosini +au BufNewFile,BufRead .notmuch-config{,.*} setf dosini +au BufNewFile,BufRead ~/.config/notmuch/*/config setf dosini +if exists('$XDG_CONFIG_HOME') + au BufNewFile,BufRead $XDG_CONFIG_HOME/notmuch/*/config setf dosini +endif " NSE - Nmap Script Engine - uses Lua syntax au BufNewFile,BufRead *.nse setf lua diff --git a/src/testdir/test_filetype.vim b/src/testdir/test_filetype.vim index b08c0f9b7b..8977d7e3ea 100644 --- a/src/testdir/test_filetype.vim +++ b/src/testdir/test_filetype.vim @@ -223,7 +223,8 @@ def s:GetFilenameChecks(): dict> '.coveragerc', '.pypirc', '.gitlint', '.oelint.cfg', 'pylintrc', '.pylintrc', '/home/user/.config/bpython/config', '/home/user/.config/mypy/config', '.wakatime.cfg', '.replyrc', 'psprint.conf', 'sofficerc', 'any/.config/lxqt/globalkeyshortcuts.conf', 'any/.config/screengrab/screengrab.conf', - 'any/.local/share/flatpak/repo/config', '.notmuch-config'], + 'any/.local/share/flatpak/repo/config', '.notmuch-config', '.notmuch-config.myprofile', + '~/.config/notmuch/myprofile/config'] + WhenConfigHome('$XDG_CONFIG_HOME/notmuch/myprofile/config'), dot: ['file.dot', 'file.gv'], dracula: ['file.drac', 'file.drc', 'file.lvs', 'file.lpe', 'drac.file'], dtd: ['file.dtd'], diff --git a/src/version.c b/src/version.c index c6f313b557..7378bab803 100644 --- 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 */ +/**/ + 744, /**/ 743, /**/