# HG changeset patch
# User edogawaconan <me@myconan.net>
# Date 1420466411 -32400
# Node ID 05785a85d6035d5f3554a1d74ff70d8a3c1d4f9f
# Parent  f5b6dba3308b4f7f19c08410151f6ec413883e9e
Fix json syntax highlighter config.

diff -r f5b6dba3308b -r 05785a85d603 rc/vimrc
--- a/rc/vimrc	Mon Jan 05 21:49:47 2015 +0900
+++ b/rc/vimrc	Mon Jan 05 23:00:11 2015 +0900
@@ -77,8 +77,11 @@
     autocmd FileType json set softtabstop=2 tabstop=8
     autocmd FileType json set expandtab
     autocmd FileType json set foldmethod=syntax
+
+    " required by syntax file
+    " reference: https://github.com/elzr/vim-json/blob/master/ftplugin/json.vim
+    let g:vim_json_syntax_conceal = 1
   augroup END
-  au! BufRead,BufNewFile *.json set filetype=json
   autocmd BufRead,BufNewFile supervisord.conf :set ft=dosini
   autocmd BufRead,BufNewFile Gemfile :set ft=ruby
   autocmd BufRead,BufNewFile config.ru :set ft=ruby
@@ -94,6 +97,8 @@
   autocmd BufRead,BufNewFile *.scss :set ft=scss
   autocmd BufRead,BufNewFile *.slim :set ft=slim
   autocmd BufRead,BufNewFile *.blade.php :set ft=blade
+  autocmd BufNewFile,BufRead *.json set filetype=json
+  autocmd BufNewFile,BufRead *.jsonp set filetype=json
 endif
 
 if has('autocmd')