From 95fb60ac5890a62f5fa94cfa11255bbf1d5c6981 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <Bram@vim.org>
Date: Tue, 8 Mar 2005 22:29:20 +0000
Subject: [PATCH] updated for version 7.0058
---
src/diff.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/src/diff.c b/src/diff.c
index bc755038da..305e68f413 100644
--- a/src/diff.c
+++ b/src/diff.c
@@ -794,6 +794,10 @@ diff_file(tmp_orig, tmp_new, tmp_diff)
+ STRLEN(tmp_diff) + STRLEN(p_srr) + 27));
if (cmd != NULL)
{
+ /* We don't want $DIFF_OPTIONS to get in the way. */
+ if (getenv("DIFF_OPTIONS"))
+ vim_setenv((char_u *)"DIFF_OPTIONS", (char_u *)"");
+
/* Build the diff command and execute it. Always use -a, binary
* differences are of no use. Ignore errors, diff returns
* non-zero when differences have been found. */
--
GitLab