thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

patch 7.4.1399

Browse Source 
Problem:    The MS-DOS code does not build.
Solution:   Remove the old MS-DOS code.
This commit is contained in:
Bram Moolenaar
2016-02-23 14:53:34 +01:00
parent 4e221c99e8
commit 48e330aff9
45 changed files with 163 additions and 4308 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/diff.c
View File

@@ -29,7 +29,7 @@ static int diff_flags = DIFF_FILLER;
static int diff_a_works = MAYBE; /* TRUE when "diff -a" works, FALSE when it
doesn't work, MAYBE when not checked yet */
#if defined(MSWIN) || defined(MSDOS)
#if defined(MSWIN)
static int diff_bin_works = MAYBE; /* TRUE when "diff --binary" works, FALSE
when it doesn't work, MAYBE when not
checked yet */
@@ -733,7 +733,7 @@ ex_diffupdate(
break;
#endif
#if defined(MSWIN) || defined(MSDOS)
#if defined(MSWIN)
/* If the "-a" argument works, also check if "--binary" works. */
if (ok && diff_a_works == MAYBE && diff_bin_works == MAYBE)
{
@@ -764,7 +764,7 @@ ex_diffupdate(
EMSG(_("E810: Cannot read or write temp files"));
EMSG(_("E97: Cannot create diffs"));
diff_a_works = MAYBE;
#if defined(MSWIN) || defined(MSDOS)
#if defined(MSWIN)
diff_bin_works = MAYBE;
#endif
goto theend;
@@ -845,7 +845,7 @@ diff_file(
* non-zero when differences have been found. */
vim_snprintf((char *)cmd, len, "diff %s%s%s%s%s %s",
diff_a_works == FALSE ? "" : "-a ",
#if defined(MSWIN) || defined(MSDOS)
#if defined(MSWIN)
diff_bin_works == TRUE ? "--binary " : "",
#else
"",