From cdd8540a20e2dbd2288b254a412ad8fa7d4bfbc8 Mon Sep 17 00:00:00 2001 From: Jan Edmund Lazo Date: Fri, 2 Aug 2019 19:43:39 -0400 Subject: vim-patch:8.1.1187: cannot recognize Pipfile Problem: Cannot recognize Pipfile. Solution: Use existing filetypes. (Charles Ross, closes vim/vim#4280) https://github.com/vim/vim/commit/3a4c53ba51c01b8fea68972453a71c55cf32edbe --- runtime/filetype.vim | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'runtime') diff --git a/runtime/filetype.vim b/runtime/filetype.vim index 473c169061..6922565192 100644 --- a/runtime/filetype.vim +++ b/runtime/filetype.vim @@ -1173,6 +1173,10 @@ au BufNewFile,BufRead *.rcp setf pilrc " Pine config au BufNewFile,BufRead .pinerc,pinerc,.pinercex,pinercex setf pine +" Pipenv Pipfiles +au BufNewFile,BufRead Pipfile setf config +au BufNewFile,BufRead Pipfile.lock setf json + " PL/1, PL/I au BufNewFile,BufRead *.pli,*.pl1 setf pli @@ -1865,7 +1869,8 @@ au BufNewFile,BufRead *.xmi setf xml au BufNewFile,BufRead *.csproj,*.csproj.user setf xml " Qt Linguist translation source and Qt User Interface Files are XML -au BufNewFile,BufRead *.ts,*.ui setf xml +" However, for .ts Typescript is more common. +au BufNewFile,BufRead *.ui setf xml " TPM's are RDF-based descriptions of TeX packages (Nikolai Weibull) au BufNewFile,BufRead *.tpm setf xml -- cgit From d827a750f71281faa28e497ef40ada645789566f Mon Sep 17 00:00:00 2001 From: Jan Edmund Lazo Date: Fri, 2 Aug 2019 19:46:21 -0400 Subject: vim-patch:8.1.1761: filetype "vuejs" causes problems for some users Problem: Filetype "vuejs" causes problems for some users. Solution: Rename to "vue". https://github.com/vim/vim/commit/4248111497ab78f45d3d48576740949778a1e76b --- runtime/filetype.vim | 3 +++ 1 file changed, 3 insertions(+) (limited to 'runtime') diff --git a/runtime/filetype.vim b/runtime/filetype.vim index 6922565192..600d323bbd 100644 --- a/runtime/filetype.vim +++ b/runtime/filetype.vim @@ -706,6 +706,9 @@ au BufNewFile,BufRead *.html,*.htm,*.shtml,*.stm call dist#ft#FThtml() " Vue.js Single File Component au BufNewFile,BufRead *.vue setf vuejs +" Vue.js Single File Component +au BufNewFile,BufRead *.vue setf vue + " HTML with Ruby - eRuby au BufNewFile,BufRead *.erb,*.rhtml setf eruby -- cgit From 12fe0cf5f9a56a71394ebf35a0ba9f4efc7e1702 Mon Sep 17 00:00:00 2001 From: Jan Edmund Lazo Date: Fri, 2 Aug 2019 19:46:54 -0400 Subject: vim-patch:8.1.1762: some filetype rules are in the wrong place Problem: Some filetype rules are in the wrong place. Solution: Move to the right place. Add a few more tests. https://github.com/vim/vim/commit/c273405188cc2f19e949089cda1f92bd81610dac --- runtime/filetype.vim | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) (limited to 'runtime') diff --git a/runtime/filetype.vim b/runtime/filetype.vim index 600d323bbd..4cc2f49a63 100644 --- a/runtime/filetype.vim +++ b/runtime/filetype.vim @@ -1,7 +1,7 @@ " Vim support file to detect file types " " Maintainer: Bram Moolenaar -" Last Change: 2019 May 06 +" Last Change: 2019 Jul 27 " Listen very carefully, I will say this only once if exists("did_load_filetypes") @@ -703,12 +703,6 @@ au BufNewFile,BufRead *.t.html setf tilde " HTML (.shtml and .stm for server side) au BufNewFile,BufRead *.html,*.htm,*.shtml,*.stm call dist#ft#FThtml() -" Vue.js Single File Component -au BufNewFile,BufRead *.vue setf vuejs - -" Vue.js Single File Component -au BufNewFile,BufRead *.vue setf vue - " HTML with Ruby - eRuby au BufNewFile,BufRead *.erb,*.rhtml setf eruby @@ -1781,12 +1775,15 @@ au BufNewFile,BufRead *.wrl setf vrml " Vroom (vim testing and executable documentation) au BufNewFile,BufRead *.vroom setf vroom -" Webmacro -au BufNewFile,BufRead *.wm setf webmacro +" Vue.js Single File Component +au BufNewFile,BufRead *.vue setf vue " WebAssembly au BufNewFile,BufRead *.wast,*.wat setf wast +" Webmacro +au BufNewFile,BufRead *.wm setf webmacro + " Wget config au BufNewFile,BufRead .wgetrc,wgetrc setf wget -- cgit