Mercurial > vim

changeset 3372:f1cde9cf023e v7.3.452

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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)
author Bram Moolenaar <bram@vim.org>
date Wed, 22 Feb 2012 17:38:00 +0100
parents 8dcf3ea92b63
children 614f664ac244
files src/ops.c src/version.c
diffstat 2 files changed, 5 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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<Del> deletes the last line. */
--- 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,