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 <julio.bacel@gmail.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>

diff --git a/runtime/filetype.vim b/runtime/filetype.vim
index 9efa11df78568b540aff5400c423622916f806a6..85412f4df063cb0c9725a6f3bce1ba4e6d9f4414 100644 (file)
--- 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 b08c0f9b7b882ff6ffd831e6b907a45b6e4a9e84..8977d7e3eaa5a55c4a45a0e451bfac39e357b746 100644 (file)
--- a/src/testdir/test_filetype.vim
+++ b/src/testdir/test_filetype.vim
@@ -223,7 +223,8 @@ def s:GetFilenameChecks(): dict<list<string>>
              '.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 c6f313b557364a38538c0807480b9ebd4883c473..7378bab803d776d60db06d61b2a1e83ec188ab3b 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 */
+/**/
+    744,
 /**/
     743,
 /**/