diff options
| author | Bram Moolenaar <Bram@vim.org> | 2015-02-17 17:50:26 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2015-02-17 17:50:26 +0100 |
| commit | c3bbad085c3ec304b111dc95aed97fea4c38a177 (patch) | |
| tree | 9597aea72a72502b8e096ab92a1983ec13c1603c /src | |
| parent | 8fc6bc71266e342d339c851b3ee472357f917597 (diff) | |
| download | vim-c3bbad085c3ec304b111dc95aed97fea4c38a177.zip | |
updated for version 7.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')
| -rw-r--r-- | src/edit.c | 7 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 5 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: diff --git a/src/version.c b/src/version.c index e92064400..3365c806c 100644 --- a/src/version.c +++ b/src/version.c @@ -742,6 +742,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 640, +/**/ 639, /**/ 638, |