diff options
| author | Bram Moolenaar <Bram@vim.org> | 2007-10-19 15:33:39 +0000 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2007-10-19 15:33:39 +0000 |
| commit | d4b96bc637e22785ad956b22ff0de97a89a869e3 (patch) | |
| tree | 78f7d8e8eca64eace93430649da9de2206db11fa | |
| parent | c188b88040b10b62871f51254350b226318885cd (diff) | |
| download | vim-git-d4b96bc637e22785ad956b22ff0de97a89a869e3.tar.gz | |
updated for version 7.1-143v7.1.143
| -rw-r--r-- | src/diff.c | 2 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 3 insertions, 1 deletions
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 @@ -667,6 +667,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 143, +/**/ 142, /**/ 141, |