commit 95fb60ac5890a62f5fa94cfa11255bbf1d5c6981
author Bram Moolenaar <Bram@vim.org> Tue Mar 08 22:29:20 2005 +0000
committer Bram Moolenaar <Bram@vim.org> Tue Mar 08 22:29:20 2005 +0000
tree 8eaa27b689d82bd20afd76964f4018ea2c1658cd
parent e2ac10d732fae811411129ff5f101fab72ac1248

updated for version 7.0058

src/diff.c

diff --git a/src/diff.c b/src/diff.c
index bc75503..305e68f 100644
--- a/src/diff.c
+++ b/src/diff.c
@@ -794,6 +794,10 @@
 				+ 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. */