Mercurial > vim

changeset 1440:93ffa40b5320 v7.1.155

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
updated for version 7.1-155
author vimboss
date Sat, 10 Nov 2007 21:51:15 +0000
parents a5b3a7fb6a5a
children 21b11491a33f
files src/undo.c src/version.c
diffstat 2 files changed, 10 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- 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;
 
--- a/src/version.c
+++ b/src/version.c
@@ -667,6 +667,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    155,
+/**/
     154,
 /**/
     153,