summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--runtime/filetype.vim2
-rw-r--r--src/testdir/test_filetype.vim2
-rw-r--r--src/version.c2
3 files changed, 4 insertions, 2 deletions
diff --git a/runtime/filetype.vim b/runtime/filetype.vim
index f63e5780e..3ace157c4 100644
--- 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 2123160c4..4556eb1d1 100644
--- 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 2f0c73c08..9c9d02562 100644
--- a/src/version.c
+++ b/src/version.c
@@ -696,6 +696,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1106,
+/**/
1105,
/**/
1104,