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

updated for version 7.4.640

Browse Source 
Problem:    After deleting characters in Insert mode such that lines are
            joined undo does not work properly. (issue 324)
Solution:   Use Insstart instead of Insstart_orig. (Christian Brabandt)
This commit is contained in:
Bram Moolenaar 2015-02-17 17:50:26 +01:00
parent 8fc6bc7126
commit c3bbad085c
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/edit.c
View File

@ -8842,7 +8842,7 @@ ins_bs(c, mode, inserted_space_p)
*/
if (curwin->w_cursor.col == 0)
{
lnum = Insstart_orig.lnum;
lnum = Insstart.lnum;
if (curwin->w_cursor.lnum == lnum
#ifdef FEAT_RIGHTLEFT
|| revins_on
@ -8852,9 +8852,8 @@ ins_bs(c, mode, inserted_space_p)
if (u_save((linenr_T)(curwin->w_cursor.lnum - 2),
(linenr_T)(curwin->w_cursor.lnum + 1)) == FAIL)
return FALSE;
--Insstart_orig.lnum;
Insstart_orig.col = MAXCOL;
Insstart = Insstart_orig;
--Insstart.lnum;
Insstart.col = MAXCOL;
}
/*
* In replace mode:

2
src/version.c
View File

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