diff options
author | Bram Moolenaar <Bram@vim.org> | 2019-05-06 21:46:10 +0200 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2019-05-06 21:46:10 +0200 |
commit | d1362211291c85d29609baab65abc764b1aec169 (patch) | |
tree | ee725fba8a17ec9cf1147452b4d8bf21dafef755 | |
parent | c7a10b35de70471519d104a74d402c63557f0512 (diff) |
patch 8.1.1284: detecting *.tmpl as htmlcheetah is outdatedv8.1.1284
Problem: Detecting *.tmpl as htmlcheetah is outdated.
Solution: Use the generic name "template". (closes #4348)
-rw-r--r-- | runtime/filetype.vim | 4 | ||||
-rw-r--r-- | src/testdir/test_filetype.vim | 2 | ||||
-rw-r--r-- | src/version.c | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/runtime/filetype.vim b/runtime/filetype.vim index d1f3884bdf..9ac773a5c5 100644 --- 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 0783d3ef66..cb55e28b63 100644 --- 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 892d1a5075..bb310e2d06 100644 --- 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, |