patch 9.0.1106: not all postfix files are recognized

Problem:    Not all postfix files are recognized.
Solution:   Recognize main.cf.proto files. (closes #11732)

diff --git a/runtime/filetype.vim b/runtime/filetype.vim
index f63e5780ee004c3f7ff1f92e99848f5d41c45772..3ace157c4944aa8318c62ce86e8a8c1c8acf46a1 100644 (file)
--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
@@ -1498,7 +1498,7 @@ au BufNewFile,BufRead *.plp                       setf plp
 au BufNewFile,BufRead *.po,*.pot               setf po
 
 " Postfix main config
-au BufNewFile,BufRead main.cf                  setf pfmain
+au BufNewFile,BufRead main.cf,main.cf.proto    setf pfmain
 
 " PostScript (+ font files, encapsulated PostScript, Adobe Illustrator)
 au BufNewFile,BufRead *.ps,*.pfa,*.afm,*.eps,*.epsf,*.epsi,*.ai          setf postscr

diff --git a/src/testdir/test_filetype.vim b/src/testdir/test_filetype.vim
index 2123160c497272ef2f40e414433ba0af203afe07..4556eb1d1a09f7006e369f2fa97aab29173cd07e 100644 (file)
--- a/src/testdir/test_filetype.vim
+++ b/src/testdir/test_filetype.vim
@@ -420,7 +420,7 @@ let s:filename_checks = {
     \ 'pdf': ['file.pdf'],
     \ 'perl': ['file.plx', 'file.al', 'file.psgi', 'gitolite.rc', '.gitolite.rc', 'example.gitolite.rc', '.latexmkrc', 'latexmkrc'],
     \ 'pf': ['pf.conf'],
-    \ 'pfmain': ['main.cf'],
+    \ 'pfmain': ['main.cf', 'main.cf.proto'],
     \ 'php': ['file.php', 'file.php9', 'file.phtml', 'file.ctp', 'file.phpt', 'file.theme'],
     \ 'pike': ['file.pike', 'file.pmod'],
     \ 'pilrc': ['file.rcp'],

diff --git a/src/version.c b/src/version.c
index 2f0c73c089b26a11dffe90d660209cd28713d989..9c9d02562e748306ea3655968bd76ab59c505e24 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -695,6 +695,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1106,
 /**/
     1105,
 /**/