patch 9.2.0821: filetype: msmtp system-wide rc file not detected

Problem:  filetype: msmtp system-wide rc file not detected (chdiza).
Solution: Detect 'msmtprc' as filetype msmtp, like '.msmtprc'
          (Doug Kearns).

fixes:  #20751
closes: #20752

Signed-off-by: Doug Kearns <dougkearns@gmail.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>

diff --git a/runtime/autoload/dist/ft.vim b/runtime/autoload/dist/ft.vim
index a72e91e3ea6fa272944733f348c7ee6af8bbc368..7473896b064830a818a07976adb9101127e8b9ec 100644 (file)
--- a/runtime/autoload/dist/ft.vim
+++ b/runtime/autoload/dist/ft.vim
@@ -3,7 +3,7 @@ vim9script
 # Vim functions for file type detection
 #
 # Maintainer:          The Vim Project <https://github.com/vim/vim>
-# Last Change:         2026 Jul 18
+# Last Change:         2026 Jul 21
 # Former Maintainer:   Bram Moolenaar <Bram@vim.org>
 
 # These functions are moved here from runtime/filetype.vim to make startup
@@ -3345,6 +3345,7 @@ const ft_from_name = {
   "meson.options": "meson",
   "meson_options.txt": "meson",
   # msmtp
+  "msmtprc": "msmtp",
   ".msmtprc": "msmtp",
   # Mrxvtrc
   "mrxvtrc": "mrxvtrc",

diff --git a/src/testdir/test_filetype.vim b/src/testdir/test_filetype.vim
index bc377440a984adc37a4742df86c47bad401d76e4..79ce8ff9c4c64c3e4347d52056720e84ac4c4938 100644 (file)
--- a/src/testdir/test_filetype.vim
+++ b/src/testdir/test_filetype.vim
@@ -560,7 +560,7 @@ def s:GetFilenameChecks(): dict<list<string>>
     mplayerconf: ['mplayer.conf', '/.mplayer/config', 'any/.mplayer/config'],
     mrxvtrc: ['mrxvtrc', '.mrxvtrc'],
     msidl: ['file.odl', 'file.mof'],
-    msmtp: ['.msmtprc'],
+    msmtp: ['msmtprc', '.msmtprc'],
     msql: ['file.msql'],
     mss: ['file.mss'],
     mupad: ['file.mu'],

diff --git a/src/version.c b/src/version.c
index 4031cd24ca23d8bb9147ffafbf8cb31b42c2e697..5d8f6e9aa27ab1256f7519e609e0fbc384916761 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -759,6 +759,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    821,
 /**/
     820,
 /**/