commit d1362211291c85d29609baab65abc764b1aec169
author Bram Moolenaar <Bram@vim.org> Mon May 06 21:46:10 2019 +0200
committer Bram Moolenaar <Bram@vim.org> Mon May 06 21:46:10 2019 +0200
tree ee725fba8a17ec9cf1147452b4d8bf21dafef755
parent c7a10b35de70471519d104a74d402c63557f0512

patch 8.1.1284: detecting *.tmpl as htmlcheetah is outdated

Problem:    Detecting *.tmpl as htmlcheetah is outdated.
Solution:   Use the generic name "template". (closes #4348)

src/testdir/test_filetype.vim

diff --git a/src/testdir/test_filetype.vim b/src/testdir/test_filetype.vim
index 0783d3e..cb55e28 100644
--- a/src/testdir/test_filetype.vim
+++ b/src/testdir/test_filetype.vim
@@ -200,7 +200,7 @@
     \ 'hog': ['file.hog', 'snort.conf', 'vision.conf'],
     \ 'hostconf': ['/etc/host.conf'],
     \ 'hostsaccess': ['/etc/hosts.allow', '/etc/hosts.deny'],
-    \ 'htmlcheetah': ['file.tmpl'],
+    \ 'template': ['file.tmpl'],
     \ 'htmlm4': ['file.html.m4'],
     \ 'httest': ['file.htt', 'file.htb'],
     \ 'ibasic': ['file.iba', 'file.ibi'],

src/version.c

diff --git a/src/version.c b/src/version.c
index 892d1a5..bb310e2 100644
--- a/src/version.c
+++ b/src/version.c
@@ -768,6 +768,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1284,
+/**/
     1283,
 /**/
     1282,