diff options
| author | Bram Moolenaar <Bram@vim.org> | 2019-02-15 21:06:09 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2019-02-15 21:06:09 +0100 |
| commit | 00590740081489db69f43d9f1c0e3f70e29ce6da (patch) | |
| tree | 5200046e5c39885c50b5057cca9110975a629eb5 /src/diff.c | |
| parent | e93e5a504f481bd0dad9c504d5fcf0e5f0dfc6e6 (diff) | |
| download | vim-git-00590740081489db69f43d9f1c0e3f70e29ce6da.tar.gz | |
patch 8.1.0927: USE_CR is never definedv8.1.0927
Problem: USE_CR is never defined.
Solution: Remove usage of USE_CR. (Ken Takata, closes #3958)
Diffstat (limited to 'src/diff.c')
| -rw-r--r-- | src/diff.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/src/diff.c b/src/diff.c index d368f9697..9220c7214 100644 --- a/src/diff.c +++ b/src/diff.c @@ -90,10 +90,6 @@ static int parse_diff_ed(char_u *line, linenr_T *lnum_orig, long *count_orig, li static int parse_diff_unified(char_u *line, linenr_T *lnum_orig, long *count_orig, linenr_T *lnum_new, long *count_new); static int xdiff_out(void *priv, mmbuffer_t *mb, int nbuf); -#ifndef USE_CR -# define tag_fgets vim_fgets -#endif - /* * Called when deleting or unloading a buffer: No longer make a diff with it. */ @@ -996,7 +992,7 @@ check_external_diff(diffio_T *diffio) for (;;) { /* There must be a line that contains "1c1". */ - if (tag_fgets(linebuf, LBUFLEN, fd)) + if (vim_fgets(linebuf, LBUFLEN, fd)) break; if (STRNCMP(linebuf, "1c1", 3) == 0) ok = TRUE; @@ -1604,7 +1600,7 @@ diff_read( } else { - if (tag_fgets(linebuf, LBUFLEN, fd)) + if (vim_fgets(linebuf, LBUFLEN, fd)) break; // end of file line = linebuf; } @@ -1626,9 +1622,9 @@ diff_read( else if ((STRNCMP(line, "@@ ", 3) == 0)) diffstyle = DIFF_UNIFIED; else if ((STRNCMP(line, "--- ", 4) == 0) - && (tag_fgets(linebuf, LBUFLEN, fd) == 0) + && (vim_fgets(linebuf, LBUFLEN, fd) == 0) && (STRNCMP(line, "+++ ", 4) == 0) - && (tag_fgets(linebuf, LBUFLEN, fd) == 0) + && (vim_fgets(linebuf, LBUFLEN, fd) == 0) && (STRNCMP(line, "@@ ", 3) == 0)) diffstyle = DIFF_UNIFIED; else |