X-Git-Url: http://47.100.26.94:8080/?a=blobdiff_plain;f=vim%2Fvimrc;h=dafbea714e132e31a8afdd02115f90e412ac1d09;hb=HEAD;hp=5c4c06afe1a8ac3ba3bd7e90dc94611855335243;hpb=3a24035e2dd0f1d1e1a9fa391ffd3e27276ff807;p=dotfiles.git

diff --git a/vim/vimrc b/vim/vimrc
index 5c4c06a..dafbea7 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -84,6 +84,7 @@ set confirm
 set nostartofline   " don't jump to first character when paging
 set wrap
 set expandtab
+set backspace=indent,eol,start
 "set textwidth, formatoptions for chinese
 set formatoptions+=m
 set colorcolumn=+1
@@ -119,6 +120,8 @@ endif
 " Mappings ---------------------------------------------------------------- {{{
 let mapleader = ";"
 map Q gq
+nnoremap Q <Nop>
+nnoremap gq <Nop>
 " Normal mode ------------------------------------------------------------- {{{
 nnoremap Y	y$
 nnoremap ' `