summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJulio B <julio.bacel@gmail.com>2024-09-26 16:22:34 +0200
committerChristian Brabandt <cb@256bit.org>2024-09-26 16:22:34 +0200
commit1a2870b57aa832500d59c17c8225a64c2b4aa619 (patch)
treeff19f342a95955dde9e05db2c08df19e6951cc39
parent06fe70c183a53ea97cd42ace490d4fb9fd14f042 (diff)
patch 9.1.0744: filetype: notmuch configs are not recognisedv9.1.0744
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>
-rw-r--r--runtime/filetype.vim6
-rw-r--r--src/testdir/test_filetype.vim3
-rw-r--r--src/version.c2
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<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 c6f313b557..7378bab803 100644
--- a/src/version.c
+++ b/src/version.c
@@ -705,6 +705,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 744,
+/**/
743,
/**/
742,