From 07d0677855f3cf79f52dbade3edbcdb4fff6af2a Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <Bram@vim.org>
Date: Sat, 10 Nov 2007 21:51:15 +0000
Subject: updated for version 7.1-155

---
 src/undo.c    | 8 ++++++++
 src/version.c | 2 ++
 2 files changed, 10 insertions(+)

diff --git a/src/undo.c b/src/undo.c
index a11f360d0..626529a15 100644
--- a/src/undo.c
+++ b/src/undo.c
@@ -1678,6 +1678,14 @@ u_freebranch(buf, uhp, uhpp)
 {
     u_header_T	    *tofree, *next;
 
+    /* If this is the top branch we may need to use u_freeheader() to update
+     * all the pointers. */
+    if (uhp == buf->b_u_oldhead)
+    {
+	u_freeheader(buf, uhp, uhpp);
+	return;
+    }
+
     if (uhp->uh_alt_prev != NULL)
 	uhp->uh_alt_prev->uh_alt_next = NULL;
 
diff --git a/src/version.c b/src/version.c
index fde9d207f..436e4850b 100644
--- a/src/version.c
+++ b/src/version.c
@@ -666,6 +666,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    155,
 /**/
     154,
 /**/
-- 
cgit v1.2.1