Ignore whitespace when diffing.

[profile.git] / .vimrc

diff --git a/.vimrc b/.vimrc
index 6bb850d..1d7d9d7 100644 (file)
--- a/.vimrc
+++ b/.vimrc
@@ -39,6 +39,7 @@ se laststatus=2
 " Use C indent style.
 se cindent
 se cinkeys=0{,0},0),:,!^F,o,O,e
+se cinoptions=b1,c2
 
 " GUI options.
 se go=aglmr
@@ -243,6 +244,9 @@ if has("win32")
   se guifont=Bitstream_Vera_Sans_Mono:h10:cANSI
 endif
 
+" Ignore whitespace when diffing.
+se diffopt=filler,iwhite
+
 " Expand window when doing a vertical diff.
 if &diff
   let &columns = 164
@@ -367,6 +371,8 @@ map Ql :call Cycle_List()<CR>:<CR>
 map Qn :call Cycle_Number()<CR>:<CR>
 " Toggle tags with Qt.
 map Qt :Tlist<CR>
+" Clear search pattern with Q/.
+map Q/ :let @/=""<CR>:<CR>
 
 " Leaving Perl mode.
 fun! PerlMode_unmap()
@@ -382,6 +388,9 @@ endif
 if version >= "700"
 version 7.0
 
+" Make diffs vertical by default.
+se diffopt+=vertical
+
 " Set size of numbers column.
 se numberwidth=5