remove <c-x> mapping and fix json plugin

This commit is contained in:
Nick Nisi
2014-09-01 17:54:54 -05:00
parent 8e1f9a090f
commit adad4a014f

View File

@@ -160,7 +160,7 @@ set laststatus=2 " show the satus line all the time
" the plugins section " the plugins section
" Close the current buffer " Close the current buffer
noremap <C-x> :q<cr> " noremap <C-x> :q<cr>
" remap esc " remap esc
inoremap jk <esc> inoremap jk <esc>
@@ -402,6 +402,9 @@ let g:ctrlp_working_path_mode = 2
let g:airline_powerline_fonts=1 let g:airline_powerline_fonts=1
let g:airline_theme='badwolf' let g:airline_theme='badwolf'
" don't hide quotes in json files
let g:vim_json_syntax_conceal = 0
let g:SuperTabCrMapping = 0 let g:SuperTabCrMapping = 0