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)

diff --git a/src/edit.c b/src/edit.c
index 2a7958217360e3a29b909cbde5cf3e9d9044b210..2e5d317b073926c723a518f31cde3d4bd23ab7a2 100644 (file)
--- 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 e92064400ff3b4405c063749c6f414814be1a4d3..3365c806cafbc61a1395a38ed1b4bda1979728c6 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -741,6 +741,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    640,
 /**/
     639,
 /**/