diff options
| author | Jan Edmund Lazo <jan.lazo@mail.utoronto.ca> | 2019-05-06 21:33:39 -0400 |
|---|---|---|
| committer | Jan Edmund Lazo <jan.lazo@mail.utoronto.ca> | 2019-05-06 22:35:45 -0400 |
| commit | b5539c2044ab029db8d90adbfc293500c9426bed (patch) | |
| tree | a00a555d07997f87728f41577363a7396f458b3c | |
| parent | 53d99b9657933bdebe6037468ffd68cfff23be0f (diff) | |
| download | rneovim-b5539c2044ab029db8d90adbfc293500c9426bed.tar.gz rneovim-b5539c2044ab029db8d90adbfc293500c9426bed.tar.bz2 rneovim-b5539c2044ab029db8d90adbfc293500c9426bed.zip | |
vim-patch:8.1.1284: detecting *.tmpl as htmlcheetah is outdated
Problem: Detecting *.tmpl as htmlcheetah is outdated.
Solution: Use the generic name "template". (closes vim/vim#4348)
https://github.com/vim/vim/commit/d1362211291c85d29609baab65abc764b1aec169
| -rw-r--r-- | runtime/filetype.vim | 4 | ||||
| -rw-r--r-- | src/nvim/testdir/test_filetype.vim | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/runtime/filetype.vim b/runtime/filetype.vim index fc6c575b99..a670f54898 100644 --- a/runtime/filetype.vim +++ b/runtime/filetype.vim @@ -707,8 +707,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/nvim/testdir/test_filetype.vim b/src/nvim/testdir/test_filetype.vim index 95b05295ca..7a99a37be4 100644 --- a/src/nvim/testdir/test_filetype.vim +++ b/src/nvim/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'], |