aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorzeertzjq <zeertzjq@outlook.com>2024-09-27 18:57:01 +0800
committerGitHub <noreply@github.com>2024-09-27 18:57:01 +0800
commit60a75780586ee7ab001529f3d0d0d3fe17c341eb (patch)
tree72d1a12e69e89d1eb05faebb9e65af69456af193
parentb63cd8cbaec1518b6580bf6e07e75a72c8779253 (diff)
downloadrneovim-60a75780586ee7ab001529f3d0d0d3fe17c341eb.tar.gz
rneovim-60a75780586ee7ab001529f3d0d0d3fe17c341eb.tar.bz2
rneovim-60a75780586ee7ab001529f3d0d0d3fe17c341eb.zip
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>
-rw-r--r--runtime/lua/vim/filetype.lua3
-rw-r--r--test/old/testdir/test_filetype.vim3
2 files changed, 5 insertions, 1 deletions
diff --git a/runtime/lua/vim/filetype.lua b/runtime/lua/vim/filetype.lua
index 5cb554b83e..2e175dff21 100644
--- 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
index f802498336..8a1ed413c0 100644
--- 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'],