diff options
Diffstat (limited to 'src/diff.c')
| -rw-r--r-- | src/diff.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/diff.c b/src/diff.c index e4bafe2c93..fb43eee844 100644 --- a/src/diff.c +++ b/src/diff.c @@ -464,7 +464,10 @@ diff_mark_adjust_tp( for (i = 0; i < DB_COUNT; ++i) if (tp->tp_diffbuf[i] != NULL && i != idx) { - dp->df_lnum[i] -= off; + if (dp->df_lnum[i] > off) + dp->df_lnum[i] -= off; + else + dp->df_lnum[i] = 1; dp->df_count[i] += n; } } @@ -2863,8 +2866,8 @@ ex_diffgetput(exarg_T *eap) { // remember deleting the last line of the buffer buf_empty = curbuf->b_ml.ml_line_count == 1; - ml_delete(lnum); - --added; + if (ml_delete(lnum) == OK) + --added; } for (i = 0; i < dp->df_count[idx_from] - start_skip - end_skip; ++i) { |