diff options
author | vimboss <devnull@localhost> | 2005-03-08 22:29:20 +0000 |
---|---|---|
committer | vimboss <devnull@localhost> | 2005-03-08 22:29:20 +0000 |
commit | b6154a83705978f8848427c324d77487670c74fc (patch) | |
tree | 8eaa27b689d82bd20afd76964f4018ea2c1658cd | |
parent | dc805b6e05ef3621d4bd4c64940bb53430f4939e (diff) | |
download | vim-b6154a83705978f8848427c324d77487670c74fc.tar.gz |
updated for version 7.0058
-rw-r--r-- | src/diff.c | 4 |
1 files changed, 4 insertions, 0 deletions
@@ -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. */ |