X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=vim%2F.vimrc;h=f26cf6ef1857670c6695eb36a7f7bdad19e6ea65;hb=4913487d6d81036a2769bfa53a125a9421957c7e;hp=8b67c498ad68cb0edb4641e3b41a5ff758847a5c;hpb=6044d8e15a4c579d9cd808a16896b99f92e35f21;p=dotfiles.git

diff --git a/vim/.vimrc b/vim/.vimrc
index 8b67c49..f26cf6e 100644
--- a/vim/.vimrc
+++ b/vim/.vimrc
@@ -33,6 +33,7 @@ set showcmd
 set showmatch
 set listchars=trail:·,tab:>→,nbsp:% ",eol:¶
 set list
+set completeopt-=preview
 
 set cursorline
 set cursorcolumn
@@ -70,7 +71,7 @@ highlight CursorColumn ctermfg=cyan ctermbg=red
 set laststatus=2
 set statusline=%F\ %m%r%h%w%q%k\ %=
 set statusline+=%n\ %#Question#%Y
-set statusline+=%#DiffChange#%{strlen(&fenc)?&fenc:&enc}\ %{&ff}
+set statusline+=%#DiffChange#%{strlen(&fenc)?&fenc:&enc}%{&bomb?'-bom':''}\ %{&ff}
 set statusline+=%#DiffAdd#%l/%L
 set statusline+=%#Todo#%c%V:0x%B
 set statusline+=%#Comment#%o
@@ -88,6 +89,7 @@ autocmd BufWinEnter *.* silent loadview
 " }}}
 
 " Windows related {{{
+nnoremap <C-b> <C-W>
 noremap <C-j> <C-w>j
 noremap <C-k> <C-w>k
 noremap <C-l> <C-w>l
@@ -137,6 +139,8 @@ iabbrev итп и т.п.
 set keywordprg=
 let g:sh_no_error = 1
 
+set termwinkey=<C-B>
+
 nmap <space> f<space>
 vmap <space> I<space><ESC>gv
 nmap _ f_l
@@ -153,6 +157,7 @@ cmap <C-P> <S-Right>
 map Q gq
 map Y y$
 cmap ][ '[,']
+imap <C-b> <C-x><C-o>
 nmap <F2> :set wrap!<CR>:set wrap?<CR>
 nmap <Tab> :buffers<CR>:b<Space>
 nmap <silent> <Home> :registers<CR>