X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=xdiff%2Fxemit.c;h=05bfa41f102801a5182e7fc642976f91e9ba7db6;hb=4c58a7111d9fb4f62ca041fc73e8aec0a2f9c800;hp=4625c1b4215231dc343478b2f4f7b4bfccf2c766;hpb=b61971520738dbdc7ea2e46f8183dffe7fa4f48d;p=git.git

diff --git a/xdiff/xemit.c b/xdiff/xemit.c
index 4625c1b42..05bfa41f1 100644
--- a/xdiff/xemit.c
+++ b/xdiff/xemit.c
@@ -59,9 +59,10 @@ static int xdl_emit_record(xdfile_t *xdf, long ri, char const *pre, xdemitcb_t *
  */
 xdchange_t *xdl_get_hunk(xdchange_t *xscr, xdemitconf_t const *xecfg) {
 	xdchange_t *xch, *xchp;
+	long max_common = 2 * xecfg->ctxlen + xecfg->interhunkctxlen;
 
 	for (xchp = xscr, xch = xscr->next; xch; xchp = xch, xch = xch->next)
-		if (xch->i1 - (xchp->i1 + xchp->chg1) > 2 * xecfg->ctxlen)
+		if (xch->i1 - (xchp->i1 + xchp->chg1) > max_common)
 			break;
 
 	return xchp;