diff options
| author | Bram Moolenaar <Bram@vim.org> | 2005-03-08 22:29:20 +0000 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2005-03-08 22:29:20 +0000 |
| commit | 95fb60ac5890a62f5fa94cfa11255bbf1d5c6981 (patch) | |
| tree | 8eaa27b689d82bd20afd76964f4018ea2c1658cd /src/diff.c | |
| parent | e2ac10d732fae811411129ff5f101fab72ac1248 (diff) | |
updated for version 7.0058
Diffstat (limited to 'src/diff.c')
| -rw-r--r-- | src/diff.c | 4 |
1 files changed, 4 insertions, 0 deletions
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. */ |