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 d1f3884bdf5a2feaa0e64bfdfa38016c0ec2393d..9ac773a5c5534247c3786f21f15e62f31b599504 100644 (file)
--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
@@ -713,8 +713,8 @@ au BufNewFile,BufRead *.erb,*.rhtml         setf eruby
 " 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 0783d3ef6689e194a58195df0de0d9b93ac82a2c..cb55e28b6399146b38b4f2919e700f038039972a 100644 (file)
--- a/src/testdir/test_filetype.vim
+++ b/src/testdir/test_filetype.vim
@@ -200,7 +200,7 @@ let s:filename_checks = {
     \ '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 892d1a50754313b607de05745594813a91ec05ba..bb310e2d066c712226ab5d1ad7fa2e3e3776a023 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -767,6 +767,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1284,
 /**/
     1283,
 /**/