diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2015-12-13 00:31:30 -0500 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2015-12-13 00:31:30 -0500 |
| commit | 014d692013c58e31a1456d218d2b38b857e6cef3 (patch) | |
| tree | bdda27b5b4fff6e5449d9c1c8cf49dfbb5840b1f /src | |
| parent | 28821397f646f015103e13bbf3dd8ccb555866c3 (diff) | |
| parent | f1b9a59ed690baaf2baadec8eb2beb0df80e878f (diff) | |
| download | rneovim-014d692013c58e31a1456d218d2b38b857e6cef3.tar.gz rneovim-014d692013c58e31a1456d218d2b38b857e6cef3.tar.bz2 rneovim-014d692013c58e31a1456d218d2b38b857e6cef3.zip | |
Merge pull request #3835 from Shougo/vim-7.4.640
vim-patch:7.4.640
Diffstat (limited to 'src')
| -rw-r--r-- | src/nvim/edit.c | 7 | ||||
| -rw-r--r-- | src/nvim/version.c | 2 |
2 files changed, 4 insertions, 5 deletions
diff --git a/src/nvim/edit.c b/src/nvim/edit.c index 8dc2844d8e..e820ea3d2b 100644 --- a/src/nvim/edit.c +++ b/src/nvim/edit.c @@ -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: diff --git a/src/nvim/version.c b/src/nvim/version.c index 932ebefa8a..72d61ff023 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -356,7 +356,7 @@ static int included_patches[] = { // 643, // 642, // 641, - // 640, + 640, // 639, // 638 NA 637, |