diff runtime/filetype.vim @ 12027:c2aa4af29251 v8.0.0894

patch 8.0.0894: there is no test for runtime filetype detection commit https://github.com/vim/vim/commit/0a0217abfabcee8b0779df2e18a186a4b41e18ce Author: Bram Moolenaar <Bram@vim.org> Date: Wed Aug 9 22:06:48 2017 +0200 patch 8.0.0894: there is no test for runtime filetype detection Problem: There is no test for runtime filetype detection. Solution: Test a list of filetypes from patterns.
author Christian Brabandt <cb@256bit.org>
date Wed, 09 Aug 2017 22:15:04 +0200
parents 49c12c93abf3
children 7eb512f2a896
line wrap: on
line diff
--- 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:	2017 Jul 11
+" Last Change:	2017 Aug 09
 
 " Listen very carefully, I will say this only once
 if exists("did_load_filetypes")
@@ -1027,7 +1027,7 @@ au BufNewFile,BufRead *.java,*.jav		setf
 au BufNewFile,BufRead *.jj,*.jjt		setf javacc
 
 " JavaScript, ECMAScript
-au BufNewFile,BufRead *.js,*.javascript,*.es,*.jsx   setf javascript
+au BufNewFile,BufRead *.js,*.javascript,*.es,*.jsx,*.mjs   setf javascript
 
 " Java Server Pages
 au BufNewFile,BufRead *.jsp			setf jsp
@@ -2267,6 +2267,8 @@ func! s:FTtex()
     elseif format == 'plaintex'
       let format = 'plain'
     endif
+  elseif expand('%') =~ 'tex/context/.*/.*.tex'
+    let format = 'context'
   else
     " Default value, may be changed later:
     let format = exists("g:tex_flavor") ? g:tex_flavor : 'plain'
@@ -2308,7 +2310,7 @@ func! s:FTtex()
 endfunc
 
 " ConTeXt
-au BufNewFile,BufRead tex/context/*/*.tex,*.mkii,*.mkiv,*.mkvi   setf context
+au BufNewFile,BufRead *.mkii,*.mkiv,*.mkvi   setf context
 
 " Texinfo
 au BufNewFile,BufRead *.texinfo,*.texi,*.txi	setf texinfo