From: Roman Perepelitsa <roman.perepelitsa@gmail.com>
To: Zsh hackers list <zsh-workers@zsh.org>
Cc: GammaFunction@vivaldi.net
Subject: Re: [BUG]: zle-line-pre-redraw breaks vi-repeat-change
Date: Wed, 16 Dec 2020 09:33:31 +0100 [thread overview]
Message-ID: <CAN=4vMqPA1WAt6_Kj99_PGH+EvOpcK5So3bON5sjBzzmeikeXg@mail.gmail.com> (raw)
In-Reply-To: <CAN=4vMrW8jtzoAATn888q=rXpukYTt6V6HEdGGo-tVn=Vaoz-A@mail.gmail.com>
[-- Attachment #1: Type: text/plain, Size: 869 bytes --]
On Wed, Oct 7, 2020 at 2:49 PM Roman Perepelitsa
<roman.perepelitsa@gmail.com> wrote:
>
> If zle-line-pre-redraw is defined, vi-repeat-change behaves as if the
> numeric argument was always 1.
>
> To reproduce from `zsh -f`:
>
> % function zle-line-pre-redraw() {}
> % zle -N zle-line-pre-redraw
> % bindkey -v
> % 123456<ESC><2X><.>
>
> The last line in more detail:
>
> - "123456" is self-insert
> - ESC is vi-cmd-mode
> - "2X" is vi-backward-delete-char with NUMERIC = 2
> - "." is vi-repeat-change
>
> Expected: BUFFER contains "16".
>
> Actual: BUFFER contains "126".
>
> The actual behavior is unchanged if <.> is replaced with <3.>. The
> expected BUFFER in this case is "6".
GammaFunction@vivaldi.net (CC-ed) has sent
https://github.com/zsh-users/zsh/pull/69 that fixes the two tests I've
described above. Here's the patch from the PR.
Roman.
[-- Attachment #2: restore-vi-repeat.patch.txt --]
[-- Type: text/plain, Size: 664 bytes --]
diff --git a/Src/Zle/zle_main.c b/Src/Zle/zle_main.c
index 8c0534708..0561c3b3b 100644
--- a/Src/Zle/zle_main.c
+++ b/Src/Zle/zle_main.c
@@ -1065,6 +1065,7 @@ redrawhook(void)
int saverrflag = errflag, savretflag = retflag;
int lastcmd_prev = lastcmd;
int old_incompfunc = incompfunc;
+ int old_viinrepeat = viinrepeat;
char *args[2];
Thingy lbindk_save = lbindk, bindk_save = bindk;
@@ -1079,6 +1080,7 @@ redrawhook(void)
incompfunc = 0;
execzlefunc(initthingy, args, 1, 0);
incompfunc = old_incompfunc;
+ viinrepeat = old_viinrepeat;
/* Restore errflag and retflag as zlecallhook() does */
errflag = saverrflag | (errflag & ERRFLAG_INT);
next prev parent reply other threads:[~2020-12-16 8:34 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-07 12:49 Roman Perepelitsa
2020-10-07 13:25 ` Peter Stephenson
2020-10-07 14:49 ` Roman Perepelitsa
2020-12-16 8:33 ` Roman Perepelitsa [this message]
2021-01-26 20:55 ` Paul
2021-01-27 10:06 ` Peter Stephenson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CAN=4vMqPA1WAt6_Kj99_PGH+EvOpcK5So3bON5sjBzzmeikeXg@mail.gmail.com' \
--to=roman.perepelitsa@gmail.com \
--cc=GammaFunction@vivaldi.net \
--cc=zsh-workers@zsh.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.vuxu.org/mirror/zsh/
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).