From 5f1e3e4473ed4364abc9f45f61e1530f70c82194 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Wed, 22 Feb 2012 17:38:00 +0100 Subject: updated for version 7.3.452 Problem: Undo broken when pasting close to the last line. (Andrey Radev) Solution: Use a flag to remember if the deleted included the last line. (Christian Brabandt) --- src/ops.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src/ops.c') diff --git a/src/ops.c b/src/ops.c index 971e3244d..e8362cd5f 100644 --- a/src/ops.c +++ b/src/ops.c @@ -1943,12 +1943,14 @@ op_delete(oap) else /* delete characters between lines */ { pos_T curpos; + int delete_last_line; /* save deleted and changed lines for undo */ if (u_save((linenr_T)(curwin->w_cursor.lnum - 1), (linenr_T)(curwin->w_cursor.lnum + oap->line_count)) == FAIL) return FAIL; + delete_last_line = (oap->end.lnum == curbuf->b_ml.ml_line_count); truncate_line(TRUE); /* delete from cursor to end of line */ curpos = curwin->w_cursor; /* remember curwin->w_cursor */ @@ -1956,7 +1958,7 @@ op_delete(oap) del_lines((long)(oap->line_count - 2), FALSE); n = (oap->end.col + 1 - !oap->inclusive); - if (oap->inclusive && oap->end.lnum == curbuf->b_ml.ml_line_count + if (oap->inclusive && delete_last_line && n > (int)STRLEN(ml_get(oap->end.lnum))) { /* Special case: gH deletes the last line. */ -- cgit v1.2.1