From 19fa21ce46d82a642e2f8c7f68f5af6494ba97dd Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <bram@vim.org>
Date: Tue, 17 Feb 2015 17:50:26 +0100
Subject: [PATCH] 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)

---
 src/edit.c    | 7 +++----
 src/version.c | 2 ++
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/edit.c b/src/edit.c
index dc1a8e23ff..f2b6d0f738 100644
--- a/src/edit.c
+++ b/src/edit.c
@@ -8857,7 +8857,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
@@ -8867,9 +8867,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 9c8b4be486..9185830ebe 100644
--- a/src/version.c
+++ b/src/version.c
@@ -756,6 +756,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    640,
 /**/
     639,
 /**/