From d7d6d8afb15eea1a264f0467896fa717e7405cea Mon Sep 17 00:00:00 2001
From: Simon Ruderich <simon@ruderich.org>
Date: Fri, 19 Jun 2009 19:37:33 +0200
Subject: [PATCH] vimrc: Don't enable spell checking with vimdiff.

---
 vimrc | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/vimrc b/vimrc
index b200fa4..4da495d 100644
--- 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
-- 
2.45.2