Mercurial > vim

changeset 16562:a6c073fa99e1 v8.1.1284

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.1.1284: detecting *.tmpl as htmlcheetah is outdated commit https://github.com/vim/vim/commit/d1362211291c85d29609baab65abc764b1aec169 Author: Bram Moolenaar <Bram@vim.org> Date: Mon May 6 21:46:10 2019 +0200 patch 8.1.1284: detecting *.tmpl as htmlcheetah is outdated Problem: Detecting *.tmpl as htmlcheetah is outdated. Solution: Use the generic name "template". (closes https://github.com/vim/vim/issues/4348)
author Bram Moolenaar <Bram@vim.org>
date Mon, 06 May 2019 22:00:06 +0200
parents fc49759f7590
children e3f4ce013a0f
files runtime/filetype.vim src/testdir/test_filetype.vim src/version.c
diffstat 3 files changed, 5 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
@@ -713,8 +713,8 @@ au BufNewFile,BufRead *.erb,*.rhtml		set
 " 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
--- 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'],
--- a/src/version.c
+++ b/src/version.c
@@ -768,6 +768,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1284,
+/**/
     1283,
 /**/
     1282,