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)
diff --git a/runtime/filetype.vim b/runtime/filetype.vim
index d1f3884..9ac773a 100644
--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
@@ -713,8 +713,8 @@
" HTML with M4
au BufNewFile,BufRead *.html.m4 setf htmlm4
-" HTML Cheetah template
-au BufNewFile,BufRead *.tmpl setf htmlcheetah
+" Some template. Used to be HTML Cheetah.
+au BufNewFile,BufRead *.tmpl setf template
" Host config
au BufNewFile,BufRead */etc/host.conf setf hostconf
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'],
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,