aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/nvim/edit.c7
-rw-r--r--src/nvim/version.c2
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 2b0d6f22f2..a1427aaf8b 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,