neovim

commit 60a75780586ee7ab001529f3d0d0d3fe17c341eb
parent b63cd8cbaec1518b6580bf6e07e75a72c8779253
Author: zeertzjq <zeertzjq@outlook.com>
Date:   Fri, 27 Sep 2024 18:57:01 +0800

vim-patch:9.1.0744: filetype: notmuch configs are not recognised (#30535)

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: vim/vim#15744

https://github.com/vim/vim/commit/1a2870b57aa832500d59c17c8225a64c2b4aa619

Co-authored-by: Julio B <julio.bacel@gmail.com>
Diffstat:
M
runtime/lua/vim/filetype.lua
 | 
3
+++
M
test/old/testdir/test_filetype.vim
 | 
3
++-

2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/runtime/lua/vim/filetype.lua b/runtime/lua/vim/filetype.lua
@@ -2109,6 +2109,8 @@ local pattern = {
     ['/bpython/config$'] = 'dosini',
     ['/flatpak/repo/config$'] = 'dosini',
     ['/mypy/config$'] = 'dosini',
+    ['^${HOME}/%.config/notmuch/.*/config$'] = 'dosini',
+    ['^${XDG_CONFIG_HOME}/notmuch/.*/config$'] = 'dosini',
     ['^${XDG_CONFIG_HOME}/git/config$'] = 'gitconfig',
     ['%.git/config%.worktree$'] = 'gitconfig',
     ['%.git/config$'] = 'gitconfig',
@@ -2259,6 +2261,7 @@ local pattern = {
   ['^%.'] = {
     ['^%.cshrc'] = detect.csh,
     ['^%.login'] = detect.csh,
+    ['^%.notmuch%-config%.'] = 'dosini',
     ['^%.gitsendemail%.msg%.......$'] = 'gitsendemail',
     ['^%.kshrc'] = detect.ksh,
     ['^%.article%.%d+$'] = 'mail',
diff --git a/test/old/testdir/test_filetype.vim b/test/old/testdir/test_filetype.vim
@@ -224,7 +224,8 @@ func s:GetFilenameChecks() abort
     \            '.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'] + s: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'],