X-Git-Url: http://git.iain.cx/?p=profile.git;a=blobdiff_plain;f=.vimrc;h=1d7d9d70fde6bde61472fb02b9af7d57caae528c;hp=3396ecd828f2d827c98a72032dbfd321d9e7ea88;hb=7bf0efc96c2bb133d2d884030ac39437f8ae7895;hpb=de3f1bd764b182133cfe9ba9a065ed8dfebf8508

diff --git a/.vimrc b/.vimrc
index 3396ecd..1d7d9d7 100644
--- a/.vimrc
+++ b/.vimrc
@@ -244,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
@@ -385,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