aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-24 03:44:06 -04:00
Code Activity

updated for version 7.0058

Browse Source
This commit is contained in:
Bram Moolenaar
2005-03-08 22:29:20 +00:00
parent e2ac10d732
commit 95fb60ac58
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/diff.c
View File

@@ -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. */