aboutsummaryrefslogtreecommitdiff
path: root/runtime
diff options
context:
space:
mode:
authorJustin M. Keyes <justinkz@gmail.com>2019-08-03 13:59:41 +0200
committerGitHub <noreply@github.com>2019-08-03 13:59:41 +0200
commit7e8dbb5958505f5b5960add91a032cd1de26586a (patch)
tree9bbd824cedeb263e54c19cba0e4bd87e73ca6568 /runtime
parent24fb7eefaad1023938f43e8addb05d273b27323a (diff)
parent620a9064069dd7f9e15782c24a5260ad1b25b445 (diff)
downloadrneovim-7e8dbb5958505f5b5960add91a032cd1de26586a.tar.gz
rneovim-7e8dbb5958505f5b5960add91a032cd1de26586a.tar.bz2
rneovim-7e8dbb5958505f5b5960add91a032cd1de26586a.zip
Merge #10678 from janlazo/vim-8.1.1187
vim-patch:8.1.{1187,1761,1762,1775}
Diffstat (limited to 'runtime')
-rw-r--r--runtime/filetype.vim19
1 files changed, 12 insertions, 7 deletions
diff --git a/runtime/filetype.vim b/runtime/filetype.vim
index 473c169061..4cc2f49a63 100644
--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
@@ -1,7 +1,7 @@
" Vim support file to detect file types
"
" Maintainer: Bram Moolenaar <Bram@vim.org>
-" 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,9 +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
-
" HTML with Ruby - eRuby
au BufNewFile,BufRead *.erb,*.rhtml setf eruby
@@ -1173,6 +1170,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
@@ -1774,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
@@ -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