patch 9.1.0322: filetype: some mail tools not recognized

Problem:  filetype: some mail tools not recognized
Solution: Detect '.mbsncrc' as conf, '.msmtprc' as msmtp
          and '.notmuch-config' as ini filetype
          (Shane-XB-Qian)

closes: #14533

Signed-off-by: shane.xb.qian <shane.qian@foxmail.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>

diff --git a/runtime/filetype.vim b/runtime/filetype.vim
index bdf2d6c6fe1a34c013f2d3c4116840ad05b90748..c7e2015a05c42a9a28671998b249766a63e55357 100644 (file)
--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
@@ -1396,6 +1396,9 @@ au BufNewFile,BufRead *.nb                        setf mma
 " Maya Extension Language
 au BufNewFile,BufRead *.mel                    setf mel
 
+" mbsync
+au BufNewFile,BufRead .mbsyncrc                        setf conf
+
 " Mercurial (hg) commit file
 au BufNewFile,BufRead hg-editor-*.txt          setf hgcommit
 
@@ -1428,6 +1431,9 @@ au BufNewFile,BufRead *.mix,*.mixal               setf mix
 " MMIX or VMS makefile
 au BufNewFile,BufRead *.mms                    call dist#ft#FTmms()
 
+" msmtp
+au BufNewFile,BufRead .msmtprc                 setf msmtp
+
 " Symbian meta-makefile definition (MMP)
 au BufNewFile,BufRead *.mmp                    setf mmp
 
@@ -1555,6 +1561,9 @@ au BufNewFile,BufRead *.mm                        call dist#ft#FTmm()
 " Not Quite C
 au BufNewFile,BufRead *.nqc                    setf nqc
 
+" notmuch
+au BufNewFile,BufRead .notmuch-config          setf dosini
+
 " NSE - Nmap Script Engine - uses Lua syntax
 au BufNewFile,BufRead *.nse                    setf lua
 
@@ -3117,3 +3126,5 @@ endfunc
 " Restore 'cpoptions'
 let &cpo = s:cpo_save
 unlet s:cpo_save
+
+" vim: ts=8

diff --git a/src/testdir/test_filetype.vim b/src/testdir/test_filetype.vim
index 079a6e646214c9cbf6857f6ab151d895519473b2..900fc2be6d0bfce709abd06a68b330f921507f7e 100644 (file)
--- a/src/testdir/test_filetype.vim
+++ b/src/testdir/test_filetype.vim
@@ -162,7 +162,7 @@ def s:GetFilenameChecks(): dict<list<string>>
     cobol: ['file.cbl', 'file.cob', 'file.lib'],
     coco: ['file.atg'],
     conaryrecipe: ['file.recipe'],
-    conf: ['auto.master', 'file.conf', 'texdoc.cnf', '.x11vncrc', '.chktexrc', '.ripgreprc', 'ripgreprc', 'file.ctags'],
+    conf: ['auto.master', 'file.conf', 'texdoc.cnf', '.x11vncrc', '.chktexrc', '.ripgreprc', 'ripgreprc', 'file.ctags', '.mbsyncrc'],
     config: ['configure.in', 'configure.ac', '/etc/hostname.file', 'any/etc/hostname.file'],
     confini: ['pacman.conf', 'paru.conf', 'mpv.conf', 'any/.aws/config', 'any/.aws/credentials', 'file.nmconnection'],
     context: ['tex/context/any/file.tex', 'file.mkii', 'file.mkiv', 'file.mkvi', 'file.mkxl', 'file.mklx'],
@@ -219,7 +219,7 @@ 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'],
+             'any/.local/share/flatpak/repo/config', '.notmuch-config'],
     dot: ['file.dot', 'file.gv'],
     dracula: ['file.drac', 'file.drc', 'filelvs', 'filelpe', 'drac.file', 'lpe', 'lvs', 'some-lpe', 'some-lvs'],
     dtd: ['file.dtd'],
@@ -476,6 +476,7 @@ def s:GetFilenameChecks(): dict<list<string>>
     msidl: ['file.odl', 'file.mof'],
     msql: ['file.msql'],
     mojo: ['file.mojo', 'file.🔥'],
+    msmtp: ['.msmtprc'],
     mupad: ['file.mu'],
     mush: ['file.mush'],
     mustache: ['file.mustache'],

diff --git a/src/version.c b/src/version.c
index d203973bd4b3a7fadb1456e72878a82557adae87..2d1a6b674dbe53493fd0992ffc4625679c9f7e8b 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 */
+/**/
+    322,
 /**/
     321,
 /**/