From 0fda80344b49d952c02721613a17026185c87840 Mon Sep 17 00:00:00 2001 From: Peter Stephenson Date: Tue, 9 Oct 2012 14:57:13 +0000 Subject: users/17314: ensure an undo change number uniquely specifies a point in editing history by incrementing the value returned by the variable. --- Src/Zle/zle_utils.c | 27 +++++++++++++++++---------- 1 file changed, 17 insertions(+), 10 deletions(-) (limited to 'Src/Zle/zle_utils.c') diff --git a/Src/Zle/zle_utils.c b/Src/Zle/zle_utils.c index cf6787f3a..55fd2ffd2 100644 --- a/Src/Zle/zle_utils.c +++ b/Src/Zle/zle_utils.c @@ -1520,23 +1520,25 @@ setlastline(void) int undo(char **args) { - zlong last_change = (zlong)0; + zlong last_change; if (*args) - { last_change = zstrtol(*args, NULL, 0); - } + else + last_change = (zlong)-1; handleundo(); do { - if(!curchange->prev) + struct change *prev = curchange->prev; + if(!prev) return 1; - if (unapplychange(curchange->prev)) - curchange = curchange->prev; + if (prev->changeno < last_change) + break; + if (unapplychange(prev)) + curchange = prev; else break; - } while (*args ? curchange->changeno != last_change : - (curchange->flags & CH_PREV)); + } while (last_change >= (zlong)0 || (curchange->flags & CH_PREV)); setlastline(); return 0; } @@ -1660,6 +1662,11 @@ zlecallhook(char *name, char *arg) zlong get_undo_current_change(UNUSED(Param pm)) { - return undo_changeno; + /* + * Increment the number in case a change is in progress; + * we don't want to back off what's already been done when + * we return to this change number. This eliminates any + * problem about the point where a change is numbered. + */ + return ++undo_changeno; } - -- cgit v1.2.3 From 34ed3eaecd3fedb8733b82c27dccba024608bf5f Mon Sep 17 00:00:00 2001 From: Peter Stephenson Date: Tue, 9 Oct 2012 16:27:11 +0000 Subject: users/17318: only increment the undo variable return value for the first request in a row --- ChangeLog | 5 ++++- Src/Zle/zle_utils.c | 11 +++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) (limited to 'Src/Zle/zle_utils.c') diff --git a/ChangeLog b/ChangeLog index 266e7f9ed..9768aa8e0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2012-10-09 Peter Stephenson + * users/17318: Src/Zle/zle_utils.c: don't increment the undo + change number for every variable read, only the first in a row. + * users/17314: Src/Zle/zle_utils.c: ensure an undo change number uniquely specifies a point in editing history by incrementing the value returned by the variable. @@ -252,5 +255,5 @@ ***************************************************** * This is used by the shell to define $ZSH_PATCHLEVEL -* $Revision: 1.5742 $ +* $Revision: 1.5743 $ ***************************************************** diff --git a/Src/Zle/zle_utils.c b/Src/Zle/zle_utils.c index 55fd2ffd2..d0e7b5542 100644 --- a/Src/Zle/zle_utils.c +++ b/Src/Zle/zle_utils.c @@ -1363,6 +1363,10 @@ static struct change *nextchanges, *endnextchanges; static zlong undo_changeno; +/* If non-zero, the last increment to undo_changeno was for the variable */ + +static int undo_set_by_variable; + /**/ void initundo(void) @@ -1373,6 +1377,7 @@ initundo(void) curchange->del = curchange->ins = NULL; curchange->dell = curchange->insl = 0; curchange->changeno = undo_changeno = 0; + undo_set_by_variable = 0; lastline = zalloc((lastlinesz = linesz) * ZLE_CHAR_SIZE); ZS_memcpy(lastline, zleline, (lastll = zlell)); lastcs = zlecs; @@ -1498,6 +1503,7 @@ mkundoent(void) ch->prev = NULL; } ch->changeno = ++undo_changeno; + undo_set_by_variable = 0; endnextchanges = ch; } @@ -1662,6 +1668,11 @@ zlecallhook(char *name, char *arg) zlong get_undo_current_change(UNUSED(Param pm)) { + if (undo_set_by_variable) { + /* We were the last to increment this, doesn't need another one. */ + return undo_changeno; + } + undo_set_by_variable = 1; /* * Increment the number in case a change is in progress; * we don't want to back off what's already been done when -- cgit v1.2.3