summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2013-11-07 03:04:11 +0100
committerBram Moolenaar <Bram@vim.org>2013-11-07 03:04:11 +0100
commitaa88732efd21347587b8b8ce0f37a4042e668f42 (patch)
treec75296f421a5174da754687bff85501f8d48ceec
parentf5a2fd880ae8f6225814209ab73783f65078a4d5 (diff)
updated for version 7.4.074v7.4.074
Problem: When undo'ing all changes and creating a new change the undo structure is incorrect. (Christian Brabandt) Solution: When deleting the branch starting at the old header, delete the whole branch, not just the first entry.
-rw-r--r--src/undo.c3
-rw-r--r--src/version.c2
2 files changed, 4 insertions, 1 deletions
diff --git a/src/undo.c b/src/undo.c
index 8646b4616b..c16f2afa75 100644
--- a/src/undo.c
+++ b/src/undo.c
@@ -3121,7 +3121,8 @@ u_freebranch(buf, uhp, uhpp)
* all the pointers. */
if (uhp == buf->b_u_oldhead)
{
- u_freeheader(buf, uhp, uhpp);
+ while (buf->b_u_oldhead != NULL)
+ u_freeheader(buf, buf->b_u_oldhead, uhpp);
return;
}
diff --git a/src/version.c b/src/version.c
index bbc36d6165..60f9bf1b97 100644
--- a/src/version.c
+++ b/src/version.c
@@ -739,6 +739,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 74,
+/**/
73,
/**/
72,