X-Git-Url: http://47.100.26.94:8080/?a=blobdiff_plain;ds=sidebyside;f=vim%2Fvimrc;h=dafbea714e132e31a8afdd02115f90e412ac1d09;hb=HEAD;hp=86878247e48f528db4ab564045b4502bc31da3f5;hpb=3a4f4747a0e186b41668eba77c847225e5c5611d;p=dotfiles.git

diff --git a/vim/vimrc b/vim/vimrc
index 8687824..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 ' `
@@ -199,8 +202,9 @@ inoremap <C-U> <C-G>u<C-U>
 inoremap <C-a>	<Home>
 inoremap <C-e>	<End>
 inoremap <C-D>	<Del>
-inoremap <C-b>	<S-Left>
-inoremap <C-f>	<S-Right>
+inoremap <C-b>	<Left>
+inoremap <C-f>	<Right>
+inoremap <C-/> <Esc>ui
 imap <A-d>	<S-Right><C-w>
 " }}}
 " Command mode ------------------------------------------------------- {{{