Merge commit 'epica/master'

[config/dotfiles.git] / vimrc

diff --git a/vimrc b/vimrc
index 95318fec57a3b4afa93f880a4193cf6b214a729d..86b49573555e34b4e2eb4f7c90e7d47ff717bcc9 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