diff options
| author | Bram Moolenaar <bram@vim.org> | 2012-02-22 17:38:00 +0100 |
|---|---|---|
| committer | Bram Moolenaar <bram@vim.org> | 2012-02-22 17:38:00 +0100 |
| commit | e42e5a67528370c7d0ca72a7c71d41f22aae441f (patch) | |
| tree | 5bf5d50f77825fb2fa2de7a7c5a2b2e2e618d55f | |
| parent | 8807a4bda077e000ee2459254e148481d3e2f8ba (diff) | |
| download | vim-e42e5a67528370c7d0ca72a7c71d41f22aae441f.tar.gz | |
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)
| -rw-r--r-- | src/ops.c | 4 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 5 insertions, 1 deletions
@@ -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<Del> deletes the last line. */ diff --git a/src/version.c b/src/version.c index f9da5db7..0b6c063b 100644 --- a/src/version.c +++ b/src/version.c @@ -715,6 +715,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 452, +/**/ 451, /**/ 450, |