Updating some stuff [lazy commit]

This commit is contained in:
Nick Nisi
2012-12-20 10:14:11 -06:00
parent 5cc67b2273
commit 2213b78583
2 changed files with 6 additions and 2 deletions

View File

@@ -68,7 +68,7 @@ set softtabstop=4
set ttyfast
" allow matching of if/end, etc. with %
runtime macros/matchit.vim
" runtime macros/matchit.vim
" highlight conflicts
match ErrorMsg '^\(<\|=\|>\)\{7\}\([^=].\+\)\?$'
@@ -191,7 +191,7 @@ set laststatus=2 " show the satus line all the time
" Additional, plugin-specific mappings are located under
" the plugins section
"
nnoremap K :q<cr>
" nnoremap K :q<cr>
" remap esc and disable to force learning
inoremap jk <esc>