summaryrefslogtreecommitdiff
path: root/src/edit.c
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2015-02-17 17:50:26 +0100
committerBram Moolenaar <Bram@vim.org>2015-02-17 17:50:26 +0100
commitc3bbad085c3ec304b111dc95aed97fea4c38a177 (patch)
tree9597aea72a72502b8e096ab92a1983ec13c1603c /src/edit.c
parent8fc6bc71266e342d339c851b3ee472357f917597 (diff)
downloadvim-git-c3bbad085c3ec304b111dc95aed97fea4c38a177.tar.gz
updated for version 7.4.640v7.4.640
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)
Diffstat (limited to 'src/edit.c')
-rw-r--r--src/edit.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/edit.c b/src/edit.c
index 2a7958217..2e5d317b0 100644
--- a/src/edit.c
+++ b/src/edit.c
@@ -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: