diff options
| author | Bram Moolenaar <Bram@vim.org> | 2007-11-10 21:51:15 +0000 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2007-11-10 21:51:15 +0000 |
| commit | 07d0677855f3cf79f52dbade3edbcdb4fff6af2a (patch) | |
| tree | de2bb8079ebb7733d84265b8cff08124e53f441e | |
| parent | 33741a0f373ed3d504d89120d4fa0b03a40c84cb (diff) | |
| download | vim-git-07d0677855f3cf79f52dbade3edbcdb4fff6af2a.tar.gz | |
updated for version 7.1-155v7.1.155
| -rw-r--r-- | src/undo.c | 8 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 10 insertions, 0 deletions
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 @@ -667,6 +667,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 155, +/**/ 154, /**/ 153, |