patch 9.1.0744: filetype: notmuch configs are not recognised

Commit: 
https://github.com/vim/vim/commit/1a2870b57aa832500d59c17c8225a64c2b4aa619
Author: Julio B <julio.ba...@gmail.com>
Date:   Thu Sep 26 16:22:34 2024 +0200

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

diff --git a/runtime/filetype.vim b/runtime/filetype.vim
index 9efa11df7..85412f4df 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 b08c0f9b7..8977d7e3e 100644
--- 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 c6f313b55..7378bab80 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,
 /**/

-- 
-- 
You received this message from the "vim_dev" maillist.
Do not top-post! Type your reply below the text you are replying to.
For more information, visit http://www.vim.org/maillist.php

--- 
You received this message because you are subscribed to the Google Groups 
"vim_dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to vim_dev+unsubscr...@googlegroups.com.
To view this discussion on the web visit 
https://groups.google.com/d/msgid/vim_dev/E1stpW0-00A1s1-Q0%40256bit.org.

Raspunde prin e-mail lui