X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=vim%2F.vimrc;h=d44abc32fc2118d9092ba9b4a1c1f59373b6c862;hb=abeca38b2bf8282f0ad673286bc51fbaf59d27f2;hp=733f05119814ef1a20a96d4281beb4be883091c0;hpb=708973aaeda51afca54c7bb10e6e2c1365bc132b;p=dotfiles.git

diff --git a/vim/.vimrc b/vim/.vimrc
index 733f051..d44abc3 100644
--- a/vim/.vimrc
+++ b/vim/.vimrc
@@ -8,7 +8,6 @@ set nocompatible
 set encoding=utf-8
 "set t_kD=
 set mouse="" " if Vim is compiled with mouse support
-set nomodeline
 
 set viminfo='100,<50,s10,f1,%,n~/secure/vim/info
 set viewdir=~/secure/vim/view
@@ -34,6 +33,7 @@ set showcmd
 set showmatch
 set listchars=trail:·,tab:>→,nbsp:% ",eol:¶
 set list
+set completeopt-=preview
 
 set cursorline
 set cursorcolumn
@@ -71,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