Mercurial > vim

changeset 193:eee3fa1b0197

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
updated for version 7.0058
author vimboss
date Tue, 08 Mar 2005 22:29:20 +0000
parents 2fcd444c4bd3
children 5f7701639303
files src/diff.c
diffstat 1 files changed, 4 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- 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. */