git://git.iain.cx/iain
/
profile.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Ignore whitespace when diffing.
[profile.git]
/
.vimrc
diff --git
a/.vimrc
b/.vimrc
index
3396ecd
..
1d7d9d7
100644
(file)
--- a/
.vimrc
+++ b/
.vimrc
@@
-244,6
+244,9
@@
if has("win32")
se guifont=Bitstream_Vera_Sans_Mono:h10:cANSI
endif
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
" Expand window when doing a vertical diff.
if &diff
let &columns = 164
@@
-385,6
+388,9
@@
endif
if version >= "700"
version 7.0
if version >= "700"
version 7.0
+" Make diffs vertical by default.
+se diffopt+=vertical
+
" Set size of numbers column.
se numberwidth=5
" Set size of numbers column.
se numberwidth=5