summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAmin Bandali <me@aminb.org>2014-10-28 22:29:31 -0400
committerAmin Bandali <me@aminb.org>2014-10-28 22:29:31 -0400
commit4167924e830392432f6d73d8fce1267dbaec028f (patch)
treeb4464c0f3836ac5a062295367ad08a293017a66e
parent5cb147f1c3fa8f319ee81f111c6531e982e78e38 (diff)
downloadconfigs-4167924e830392432f6d73d8fce1267dbaec028f.tar.gz
configs-4167924e830392432f6d73d8fce1267dbaec028f.tar.xz
configs-4167924e830392432f6d73d8fce1267dbaec028f.zip
add vim-json
and partially resolve its conflict with indentLine
Diffstat (limited to '')
-rw-r--r--vim/.vimrc4
1 files changed, 4 insertions, 0 deletions
diff --git a/vim/.vimrc b/vim/.vimrc
index 4a3981d..e3c3679 100644
--- a/vim/.vimrc
+++ b/vim/.vimrc
@@ -21,6 +21,7 @@ Plugin 'Yggdroot/indentLine'
Plugin 'airblade/vim-gitgutter'
"Plugin 'altercation/vim-colors-solarized'
Plugin 'terryma/vim-multiple-cursors'
+Plugin 'elzr/vim-json'
call vundle#end() " required
" ==== </Vundle> ====
@@ -237,3 +238,6 @@ let &t_EI = "\<Esc>]50;CursorShape=0\x7"
set pastetoggle=<leader>t
+set conceallevel=0
+let g:vim_json_syntax_conceal = 0
+let g:indentLine_noConcealCursor=""