updated for version 7.1-155

diff --git a/src/undo.c b/src/undo.c
index a11f360d0ec3522bded23a5daefae5e4422be87b..626529a15cb580d69f25617fe7ec83865531410d 100644 (file)
--- 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 fde9d207fdd2e845b72d746696dab2095b09e1bb..436e4850bf0c281d2a56e42f872f6a8f2b2ca944 100644 (file)
--- 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,
 /**/