IntenseFinance/neovim
3
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-02-25 18:55:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3835 from Shougo/vim-7.4.640

Browse Source 
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/nvim/edit.c
View File

@ -7427,15 +7427,14 @@ static int ins_bs(int c, int mode, int *inserted_space_p)
* delete newline! * delete newline!
*/ */
if (curwin->w_cursor.col == 0) { if (curwin->w_cursor.col == 0) {
lnum = Insstart_orig.lnum; lnum = Insstart.lnum;
if (curwin->w_cursor.lnum == lnum || revins_on) { if (curwin->w_cursor.lnum == lnum || revins_on) {
if (u_save((linenr_T)(curwin->w_cursor.lnum - 2), if (u_save((linenr_T)(curwin->w_cursor.lnum - 2),
(linenr_T)(curwin->w_cursor.lnum + 1)) == FAIL) { (linenr_T)(curwin->w_cursor.lnum + 1)) == FAIL) {
return FALSE; return FALSE;
} }
--Insstart_orig.lnum; --Insstart.lnum;
Insstart_orig.col = MAXCOL; Insstart.col = MAXCOL;
Insstart = Insstart_orig;
} }
/* /*
* In replace mode: * In replace mode:

2
src/nvim/version.c
View File

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