From 4d89ec25f17712e8e1710727a7ca211c5591d9e9 Mon Sep 17 00:00:00 2001 From: Oliver Kiddle Date: Mon, 3 Nov 2014 00:31:57 +0100 Subject: 33575: reset vi change start position if text is inserted before it or on history movement --- Src/Zle/zle_params.c | 2 +- Src/Zle/zle_utils.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) (limited to 'Src') diff --git a/Src/Zle/zle_params.c b/Src/Zle/zle_params.c index 5845207fa..dc5fed4ce 100644 --- a/Src/Zle/zle_params.c +++ b/Src/Zle/zle_params.c @@ -198,7 +198,7 @@ set_buffer(UNUSED(Param pm), char *x) setline(x, 0); zsfree(x); } else - zlecs = zlell = 0; + viinsbegin = zlecs = zlell = 0; fixsuffix(); menucmp = 0; } diff --git a/Src/Zle/zle_utils.c b/Src/Zle/zle_utils.c index 46d5373fb..741f119d2 100644 --- a/Src/Zle/zle_utils.c +++ b/Src/Zle/zle_utils.c @@ -785,6 +785,8 @@ spaceinline(int ct) if (mark > zlecs) mark += ct; + if (viinsbegin > zlecs) + viinsbegin = 0; if (region_highlights) { for (rhp = region_highlights + N_SPECIAL_HIGHLIGHTS; @@ -1104,6 +1106,7 @@ setline(char *s, int flags) */ free(zleline); + viinsbegin = 0; zleline = stringaszleline(scp, 0, &zlell, &linesz, NULL); if ((flags & ZSL_TOEND) && (zlecs = zlell) && invicmdmode()) -- cgit 1.4.1