Re: bug in replace-string: widget loses characters

[Peter Stephenson <p.w.stephenson@xxxxxxxxxxxx>]

On 9 October 2012 16:44, Peter Stephenson <p.stephenson@xxxxxxxxxxx> wrote:
> If it seems a preferable way of doing it, it's straightforward to add a
> flag saying who last incremented the number, so it only gets incremented
> the first time.  The change numbers for the edits are hidden, so that
> ought to do the trick.

Might as well avoid making unnecessary changes, I suppose.

Index: Src/Zle/zle_utils.c
===================================================================
RCS file: /cvsroot/zsh/zsh/Src/Zle/zle_utils.c,v
retrieving revision 1.64
diff -p -u -r1.64 zle_utils.c
--- Src/Zle/zle_utils.c	9 Oct 2012 14:57:16 -0000	1.64
+++ Src/Zle/zle_utils.c	9 Oct 2012 16:09:22 -0000
@@ -1363,6 +1363,10 @@ static struct change *nextchanges, *endn

 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

pws