vimrc: Don't highlight overlong lines in diff mode.

diff --git a/vimrc b/vimrc
index a0afc90234302acf83a47fee1c89bb12532c2086..e040414ec413a0181f4f43259ec2e788d570da8b 100644 (file)
--- 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