thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

updated for version 7.3.452

Browse Source 
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)
This commit is contained in:
Bram Moolenaar
2012-02-22 17:38:00 +01:00
parent db7207e6e5
commit 5f1e3e4473
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/ops.c
View File

@@ -1943,12 +1943,14 @@ op_delete(oap)
else /* delete characters between lines */ else /* delete characters between lines */
{ {
pos_T curpos; pos_T curpos;
int delete_last_line;
/* save deleted and changed lines for undo */ /* save deleted and changed lines for undo */
if (u_save((linenr_T)(curwin->w_cursor.lnum - 1), if (u_save((linenr_T)(curwin->w_cursor.lnum - 1),
(linenr_T)(curwin->w_cursor.lnum + oap->line_count)) == FAIL) (linenr_T)(curwin->w_cursor.lnum + oap->line_count)) == FAIL)
return 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 */ truncate_line(TRUE); /* delete from cursor to end of line */
curpos = curwin->w_cursor; /* remember curwin->w_cursor */ curpos = curwin->w_cursor; /* remember curwin->w_cursor */
@@ -1956,7 +1958,7 @@ op_delete(oap)
del_lines((long)(oap->line_count - 2), FALSE); del_lines((long)(oap->line_count - 2), FALSE);
n = (oap->end.col + 1 - !oap->inclusive); 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))) && n > (int)STRLEN(ml_get(oap->end.lnum)))
{ {
/* Special case: gH<Del> deletes the last line. */ /* Special case: gH<Del> deletes the last line. */

2
src/version.c
View File

@@ -714,6 +714,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
452,
/**/ /**/
451, 451,
/**/ /**/