Mercurial > vim
diff src/diff.c @ 8212:05b88224cea1 v7.4.1399
commit https://github.com/vim/vim/commit/48e330aff911be1c798c88a973af6437a8141fce
Author: Bram Moolenaar <Bram@vim.org>
Date: Tue Feb 23 14:53:34 2016 +0100
patch 7.4.1399
Problem: The MS-DOS code does not build.
Solution: Remove the old MS-DOS code.
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Tue, 23 Feb 2016 15:00:08 +0100 |
| parents | 83861277e6a3 |
| children | db2a07b710ed |
line wrap: on
line diff
--- a/src/diff.c +++ b/src/diff.c @@ -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 "",