Set diff mode columns sensibly.

diff --git a/.vimrc b/.vimrc
index 6e26f27..65d8895 100644 (file)
--- a/.vimrc
+++ b/.vimrc
@@ -467,7 +467,9 @@ se diffopt=filler,iwhite
 
 " Expand window when doing a vertical diff.
 if &diff
-  let &columns = 164
+  if &columns < 161
+    let &columns = &columns * 2
+  endif
 endif
 
 " Remember that we are opening the quickfix window.