aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-26 04:04:07 -04:00
Code Activity

updated for version 7.0-182

Browse Source
This commit is contained in:
Bram Moolenaar
2007-01-09 19:23:12 +00:00
parent 9460b9d215
commit 89ed3dfd87
2 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/undo.c
View File

@@ -341,11 +341,15 @@ u_savecommon(top, bot, newbot)
uhp->uh_alt_next = old_curhead; uhp->uh_alt_next = old_curhead;
if (old_curhead != NULL) if (old_curhead != NULL)
{ {
uhp->uh_alt_prev = old_curhead->uh_alt_prev;
if (uhp->uh_alt_prev != NULL)
uhp->uh_alt_prev->uh_alt_next = uhp;
old_curhead->uh_alt_prev = uhp; old_curhead->uh_alt_prev = uhp;
if (curbuf->b_u_oldhead == old_curhead) if (curbuf->b_u_oldhead == old_curhead)
curbuf->b_u_oldhead = uhp; curbuf->b_u_oldhead = uhp;
} }
uhp->uh_alt_prev = NULL; else
uhp->uh_alt_prev = NULL;
if (curbuf->b_u_newhead != NULL) if (curbuf->b_u_newhead != NULL)
curbuf->b_u_newhead->uh_prev = uhp; curbuf->b_u_newhead->uh_prev = uhp;
@@ -856,6 +860,11 @@ undo_time(step, sec, absolute)
uhp = curbuf->b_u_curhead; uhp = curbuf->b_u_curhead;
while (uhp != NULL) while (uhp != NULL)
{ {
/* Go back to the first branch with a mark. */
while (uhp->uh_alt_prev != NULL
&& uhp->uh_alt_prev->uh_walk == mark)
uhp = uhp->uh_alt_prev;
/* Find the last branch with a mark, that's the one. */ /* Find the last branch with a mark, that's the one. */
last = uhp; last = uhp;
while (last->uh_alt_next != NULL while (last->uh_alt_next != NULL
@@ -865,6 +874,8 @@ undo_time(step, sec, absolute)
{ {
/* Make the used branch the first entry in the list of /* Make the used branch the first entry in the list of
* alternatives to make "u" and CTRL-R take this branch. */ * alternatives to make "u" and CTRL-R take this branch. */
while (uhp->uh_alt_prev != NULL)
uhp = uhp->uh_alt_prev;
if (last->uh_alt_next != NULL) if (last->uh_alt_next != NULL)
last->uh_alt_next->uh_alt_prev = last->uh_alt_prev; last->uh_alt_next->uh_alt_prev = last->uh_alt_prev;
last->uh_alt_prev->uh_alt_next = last->uh_alt_next; last->uh_alt_prev->uh_alt_next = last->uh_alt_next;

2
src/version.c
View File

@@ -666,6 +666,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
182,
/**/ /**/
181, 181,
/**/ /**/