aboutsummaryrefslogtreecommitdiff
path: root/runtime/filetype.vim
diff options
context:
space:
mode:
authorJustin M. Keyes <justinkz@gmail.com>2014-12-30 10:03:41 -0500
committerJustin M. Keyes <justinkz@gmail.com>2014-12-30 10:03:41 -0500
commit91b378d349425d0ad435c06fc341de5aa2f7b5c9 (patch)
tree70000a45f064d08fb8c20acefb3342ea9df73893 /runtime/filetype.vim
parentb5c7fbf4b09334fce266ba9a644e3dd6980993a8 (diff)
parente114529972c713d49ee50896760ea00365abe486 (diff)
downloadrneovim-91b378d349425d0ad435c06fc341de5aa2f7b5c9.tar.gz
rneovim-91b378d349425d0ad435c06fc341de5aa2f7b5c9.tar.bz2
rneovim-91b378d349425d0ad435c06fc341de5aa2f7b5c9.zip
Merge pull request #1759 from fwalch/vim-babc6a1
vim-patch:babc6a1
Diffstat (limited to 'runtime/filetype.vim')
-rw-r--r--runtime/filetype.vim4
1 files changed, 2 insertions, 2 deletions
diff --git a/runtime/filetype.vim b/runtime/filetype.vim
index 1ab03ecb52..40ccee960d 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 Aug 22
+" Last Change: 2014 Aug 23
" Listen very carefully, I will say this only once
if exists("did_load_filetypes")
@@ -1007,7 +1007,7 @@ au BufNewFile,BufRead *.jgr setf jgraph
au BufNewFile,BufRead *.jov,*.j73,*.jovial setf jovial
" JSON
-au BufNewFile,BufRead *.json setf json
+au BufNewFile,BufRead *.json,*.jsonp setf json
" Kixtart
au BufNewFile,BufRead *.kix setf kix