From 06a7d83ea680b38839c23ef6ec64325e28c40c9c Mon Sep 17 00:00:00 2001
From: Simon Ruderich <simon@ruderich.org>
Date: Sun, 17 Jun 2012 15:42:17 +0200
Subject: [PATCH] vimrc: Don't highlight overlong lines in diff mode.

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

diff --git a/vimrc b/vimrc
index a0afc90..e040414 100644
--- a/vimrc
+++ b/vimrc
@@ -521,9 +521,9 @@ if has('syntax')
 " Highlight lines longer than 78 characters. Thanks to Tony Mechelynck
 " <antoine.mechelynck@gmail.com> from the Vim mailing list. It can easily be
 " disabled when necessary with :2match (in Vim >= 700).
-        if exists(':2match')
+        if !&diff && exists(':2match')
             2match Todo /\%>78v./
-        else
+        elseif !&diff
             match Todo /\%>78v./
         endif
 
-- 
2.44.1