diff options
| -rw-r--r-- | xdiff-interface.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/xdiff-interface.c b/xdiff-interface.c index 9ee877c6f4..4b8e5cca80 100644 --- a/xdiff-interface.c +++ b/xdiff-interface.c @@ -115,17 +115,20 @@ static void trim_common_tail(mmfile_t *a, mmfile_t *b, long ctx) char *bp = b->ptr + b->size; long smaller = (a->size < b->size) ? a->size : b->size; + if (ctx) + return; + while (blk + trimmed <= smaller && !memcmp(ap - blk, bp - blk, blk)) { trimmed += blk; ap -= blk; bp -= blk; } - while (recovered < trimmed && 0 <= ctx) + while (recovered < trimmed) if (ap[recovered++] == '\n') - ctx--; - a->size -= (trimmed - recovered); - b->size -= (trimmed - recovered); + break; + a->size -= trimmed - recovered; + b->size -= trimmed - recovered; } int xdi_diff(mmfile_t *mf1, mmfile_t *mf2, xpparam_t const *xpp, xdemitconf_t const *xecfg, xdemitcb_t *xecb) |