diff options
| author | Bram Moolenaar <Bram@vim.org> | 2014-07-19 14:04:47 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2014-07-19 14:04:47 +0200 |
| commit | 07d87790f1e733d69bd7910bf049adeeb6d0f338 (patch) | |
| tree | cfafa9324d4664657695a094a68107ad5e6279e4 /runtime/filetype.vim | |
| parent | a04854932ec96ab48498fd4a5e8b5f4fd4df14cf (diff) | |
| download | vim-07d87790f1e733d69bd7910bf049adeeb6d0f338.zip | |
Update runtime files. Make matchparen plugin backwards compatible.
Add json filetype.
Diffstat (limited to 'runtime/filetype.vim')
| -rw-r--r-- | runtime/filetype.vim | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/runtime/filetype.vim b/runtime/filetype.vim index 677e9bbdb..b9f8b9079 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: 2014 Jul 09 +" Last Change: 2014 Jul 16 " Listen very carefully, I will say this only once if exists("did_load_filetypes") @@ -989,7 +989,7 @@ au BufNewFile,BufRead *.java,*.jav setf java au BufNewFile,BufRead *.jj,*.jjt setf javacc " JavaScript, ECMAScript -au BufNewFile,BufRead *.js,*.javascript,*.es,*.jsx,*.json setf javascript +au BufNewFile,BufRead *.js,*.javascript,*.es,*.jsx setf javascript " Java Server Pages au BufNewFile,BufRead *.jsp setf jsp @@ -1007,6 +1007,9 @@ au BufNewFile,BufRead *.jgr setf jgraph " Jovial au BufNewFile,BufRead *.jov,*.j73,*.jovial setf jovial +" JSON +au BufNewFile,BufRead *.json setf json + " Kixtart au BufNewFile,BufRead *.kix setf kix |