From: "Jun T." <takimoto-j@kba.biglobe.ne.jp>
To: zsh-workers@zsh.org
Subject: Re: zle: vi mode: wrong undo handling on fresh lines
Date: Wed, 5 Feb 2014 02:11:44 +0900 [thread overview]
Message-ID: <0DF7F868-2406-473B-9477-D9FA5F6109F5@kba.biglobe.ne.jp> (raw)
In-Reply-To: <17235.1391469962@thecus.kiddle.eu>
2014/02/04 08:26, Oliver Kiddle <okiddle@yahoo.co.uk> wrote:
> Anyway with the help of your hint, perhaps this:
> zle -C undo-complete-word .complete-word _main_complete
> complete-word() {
> zle split-undo
> zle undo-complete-word
> }
> zle -N complete-word
Thanks. It seems this solves my second problem.
There is another problem, however:
$ bindkey -v
$ echo xxx<esc>u # type something and then undo
$ # this is OK
$ echo yyy # hit 'i' and type something more
$ echo yyy<esc>u # undo again
$ # also OK, but if I hit 'u' again
$ echo yyy # then the command line goes back to this
Of course the expected behavior is that the command line remains
empty because there is nothing more to undo.
A possible patch is attached below. What the patch does is to
set CH_PREV in current->flags only if current->prev exists.
# If CH_PREV is set when current->prev is NULL, undo() returns
# without calling setlastline() (zle_utils.c, line 1543).
# This means lastline remains as "echo yyy" even if zleline is
# erased to "", and next call of handleundo() will add a wrong
# undo entry.
diff --git a/Src/Zle/zle_utils.c b/Src/Zle/zle_utils.c
index 68d27f8..3af8ed7 100644
--- a/Src/Zle/zle_utils.c
+++ b/Src/Zle/zle_utils.c
@@ -1649,12 +1649,12 @@ splitundo(char **args)
void
mergeundo(void)
{
- struct change *current = curchange->prev;
- while (current && current->changeno > vistartchange+1) {
+ struct change *current;
+ for (current = curchange->prev;
+ current && current->prev && current->changeno > vistartchange+1;
+ current = current->prev) {
current->flags |= CH_PREV;
- current = current->prev;
- if (!current) break;
- current->flags |= CH_NEXT;
+ current->prev->flags |= CH_NEXT;
}
}
next prev parent reply other threads:[~2014-02-04 17:11 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-09-22 12:37 Hauke Petersen
2013-09-22 18:24 ` Bart Schaefer
2013-09-22 20:27 ` Hauke Petersen
2013-09-23 4:57 ` Bart Schaefer
2013-09-23 20:30 ` Peter Stephenson
2014-01-24 23:19 ` Oliver Kiddle
2014-01-25 19:15 ` Bart Schaefer
2014-01-27 12:43 ` Peter Stephenson
2014-01-27 16:11 ` Peter Stephenson
2014-01-28 14:58 ` Peter Stephenson
2014-01-28 16:28 ` Bart Schaefer
2014-01-28 16:47 ` Peter Stephenson
2014-01-28 17:41 ` Bart Schaefer
2014-01-28 23:00 ` Oliver Kiddle
2014-01-29 2:59 ` Bart Schaefer
2014-01-29 10:50 ` Oliver Kiddle
2014-01-29 14:48 ` Bart Schaefer
2014-01-30 14:51 ` Jun T.
2014-01-30 15:38 ` Peter Stephenson
2014-01-30 16:03 ` Bart Schaefer
2014-01-31 12:00 ` Jun T.
2014-01-31 15:19 ` Bart Schaefer
2014-01-31 15:33 ` Peter Stephenson
[not found] ` <16181.1391175951@thecus.kiddle.eu>
2014-01-31 16:43 ` Jun T.
2014-01-31 21:37 ` Oliver Kiddle
2014-01-31 22:32 ` Oliver Kiddle
2014-02-01 19:27 ` Bart Schaefer
2014-02-03 16:20 ` Jun T.
2014-02-03 21:29 ` Oliver Kiddle
2014-02-03 22:20 ` Bart Schaefer
2014-02-03 23:26 ` Oliver Kiddle
2014-02-04 17:11 ` Jun T. [this message]
2014-02-05 22:00 ` Oliver Kiddle
2014-02-02 22:10 ` Oliver Kiddle
2014-02-07 14:43 ` Oliver Kiddle
2014-02-07 16:22 ` Bart Schaefer
2014-01-27 16:29 ` Bart Schaefer
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=0DF7F868-2406-473B-9477-D9FA5F6109F5@kba.biglobe.ne.jp \
--to=takimoto-j@kba.biglobe.ne.jp \
--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).