# HG changeset patch
# User vimboss
# Date 1110320960 0
# Node ID eee3fa1b01978f7ecd63e38d934eabfe6dfc8fdd
# Parent  2fcd444c4bd37f916da718bf5bbe9535d2667331
updated for version 7.0058

diff --git a/src/diff.c b/src/diff.c
--- 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. */