summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorvimboss <devnull@localhost>2007-10-19 15:33:39 +0000
committervimboss <devnull@localhost>2007-10-19 15:33:39 +0000
commit66a473d4ff09769320b53edbc9085a39767ec193 (patch)
tree78f7d8e8eca64eace93430649da9de2206db11fa
parentaa8da195d46ae0d7ac7220a6a43d205c123bceba (diff)
downloadvim-66a473d4ff09769320b53edbc9085a39767ec193.tar.gz
updated for version 7.1-143v7.1.143v7-1-143
-rw-r--r--src/diff.c2
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/diff.c b/src/diff.c
index 23142cf0..bdbda089 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 daa1b0b2..fa09a105 100644
--- a/src/version.c
+++ b/src/version.c
@@ -667,6 +667,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 143,
+/**/
142,
/**/
141,