vimrc: Don't enable spell checking with vimdiff.

diff --git a/vimrc b/vimrc
index b200fa4b63a2710da59db4995b0993cff65a8b47..4da495dccef8218aa0948ace420af49165dceed3 100644 (file)
--- a/vimrc
+++ b/vimrc
@@ -84,8 +84,9 @@ endif
 set ignorecase
 set smartcase
 
-" Activate spell checking, use English as default.
-if v:version >= 700
+" Activate spell checking, use English as default. Don't use spell checking
+" when diffing.
+if v:version >= 700 && !&diff
     set spell
     set spelllang=en_us
 endif