From: Bram Moolenaar Date: Fri, 19 Oct 2007 15:33:39 +0000 (+0000) Subject: updated for version 7.1-143 X-Git-Tag: v7.1.143 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d4b96bc637e22785ad956b22ff0de97a89a869e3;p=vim updated for version 7.1-143 --- diff --git a/src/diff.c b/src/diff.c index 23142cf03..bdbda0893 100644 --- a/src/diff.c +++ b/src/diff.c @@ -1310,7 +1310,7 @@ diff_read(idx_orig, idx_new, fname) dp->df_count[idx_new] += -off; off = 0; } - for (i = idx_orig; i < idx_new + !notset; ++i) + for (i = idx_orig; i < idx_new; ++i) if (curtab->tp_diffbuf[i] != NULL) dp->df_count[i] = dpl->df_lnum[i] + dpl->df_count[i] - dp->df_lnum[i] + off; diff --git a/src/version.c b/src/version.c index daa1b0b20..fa09a1059 100644 --- a/src/version.c +++ b/src/version.c @@ -666,6 +666,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 143, /**/ 142, /**/