diff options
| author | Ron Yorston <rmy@pobox.com> | 2015-08-04 09:46:24 +0100 |
|---|---|---|
| committer | Ron Yorston <rmy@pobox.com> | 2015-08-04 09:46:24 +0100 |
| commit | 64fde14d12cc5e6182f114ecaf4340ec1854c2f6 (patch) | |
| tree | 4d2cabca7865dd74e2344834d89503c534fb502c /editors | |
| parent | 7aabb625005c642d6a30d6d97b51bf183429152e (diff) | |
| parent | 16aa7a73c40ba5dfaabaedb8a5533619cb8b6cb6 (diff) | |
| download | busybox-w32-64fde14d12cc5e6182f114ecaf4340ec1854c2f6.tar.gz busybox-w32-64fde14d12cc5e6182f114ecaf4340ec1854c2f6.tar.bz2 busybox-w32-64fde14d12cc5e6182f114ecaf4340ec1854c2f6.zip | |
Merge branch 'busybox' into merge
Diffstat (limited to 'editors')
| -rw-r--r-- | editors/diff.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/editors/diff.c b/editors/diff.c index cf14b1d03..e0adcee59 100644 --- a/editors/diff.c +++ b/editors/diff.c | |||
| @@ -658,8 +658,8 @@ static bool diff(FILE* fp[2], char *file[2]) | |||
| 658 | } | 658 | } |
| 659 | 659 | ||
| 660 | for (j = 0; j < 2; j++) | 660 | for (j = 0; j < 2; j++) |
| 661 | for (k = v[j].a; k < v[j].b; k++) | 661 | for (k = v[j].a; k <= v[j].b; k++) |
| 662 | nonempty |= (ix[j][k+1] - ix[j][k] != 1); | 662 | nonempty |= (ix[j][k] - ix[j][k - 1] != 1); |
| 663 | 663 | ||
| 664 | vec = xrealloc_vector(vec, 6, ++idx); | 664 | vec = xrealloc_vector(vec, 6, ++idx); |
| 665 | memcpy(vec[idx], v, sizeof(v)); | 665 | memcpy(vec[idx], v, sizeof(v)); |