Merge pull request #3835 from Shougo/vim-7.4.640

vim-patch:7.4.640
This commit is contained in:
Justin M. Keyes 2015-12-13 00:31:30 -05:00
commit 014d692013
2 changed files with 4 additions and 5 deletions

View File

@ -7427,15 +7427,14 @@ static int ins_bs(int c, int mode, int *inserted_space_p)
* delete newline!
*/
if (curwin->w_cursor.col == 0) {
lnum = Insstart_orig.lnum;
lnum = Insstart.lnum;
if (curwin->w_cursor.lnum == lnum || revins_on) {
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:

View File

@ -356,7 +356,7 @@ static int included_patches[] = {
// 643,
// 642,
// 641,
// 640,
640,
// 639,
// 638 NA
637,