From: Oliver Kiddle <okiddle@yahoo.co.uk>
To: zsh-workers@zsh.org
Subject: Re: zle: vi mode: wrong undo handling on fresh lines
Date: Wed, 05 Feb 2014 23:00:33 +0100 [thread overview]
Message-ID: <2811.1391637633@thecus.kiddle.eu> (raw)
In-Reply-To: <0DF7F868-2406-473B-9477-D9FA5F6109F5@kba.biglobe.ne.jp>
"Jun T." wrote:
> Thanks. It seems this solves my second problem.
>
> There is another problem, however:
Thanks. Hopefully that's the end of it. Below is a patch for documentation and
test cases. I'll push the changes now.
Oliver
diff --git a/Doc/Zsh/zle.yo b/Doc/Zsh/zle.yo
index 2d77568..6d3bb4b 100644
--- a/Doc/Zsh/zle.yo
+++ b/Doc/Zsh/zle.yo
@@ -1293,8 +1293,11 @@ item(tt(redisplay))(
Redisplay the command line, remaining in incremental search mode.
)
item(tt(vi-cmd-mode))(
-Toggle between the `tt(main)' and `tt(vicmd)' keymaps;
+Select the `tt(vicmd)' keymap;
the `tt(main)' keymap (insert mode) will be selected initially.
+
+In addition, the modifications that were made while in vi insert mode are
+merged to form a single undo event.
)
xitem(tt(vi-repeat-search))
item(tt(vi-rev-repeat-search))(
@@ -2191,6 +2194,13 @@ tindex(spell-word)
item(tt(spell-word) (ESC-$ ESC-S ESC-s) (unbound) (unbound))(
Attempt spelling correction on the current word.
)
+tindex(split-undo)
+item(tt(split-undo))(
+Breaks the undo sequence at the current change. This is useful in vi mode as
+changes made in insert mode are coalesced on entering command mode. Similarly,
+tt(undo) will normally revert as one all the changes made by a user-defined
+widget.
+)
tindex(undefined-key)
item(tt(undefined-key))(
This command is executed when a key sequence that is not bound to any
@@ -2202,6 +2212,10 @@ Incrementally undo the last text modification. When called from a
user-defined widget, takes an optional argument indicating a previous state
of the undo history as returned by the tt(UNDO_CHANGE_NO) variable;
modifications are undone until that state is reached.
+
+Note that when invoked from vi command mode, the full prior change made in
+insert mode is reverted, the changes having been merged when command mode was
+selected.
)
tindex(redo)
item(tt(redo))(
diff --git a/Test/X02zlevi.ztst b/Test/X02zlevi.ztst
index d4a125f..fe55d8a 100644
--- a/Test/X02zlevi.ztst
+++ b/Test/X02zlevi.ztst
@@ -10,6 +10,63 @@
%test
+ zletest $'word\euaend'
+0:undo initial change
+>BUFFER: end
+>CURSOR: 3
+
+ zletest $'text\e.'
+0:repeat initial edit
+>BUFFER: text
+>text
+>CURSOR: 8
+
+ comptesteval 'print -z before'
+ zletest $'after\e.'
+0:repeat initial edit with non-blank starting line
+>BUFFER: beforeafterafter
+>CURSOR: 15
+
+ comptesteval 'setopt overstrike;print -z bung'
+ zletest $'ing\e2|.'
+0:repeat initial edit with overstrike set
+>BUFFER: binging
+>CURSOR: 3
+
+ comptesteval 'bindkey "^_" undo'
+ zletest $'undoc\037e'
+0:use of undo in vi insert mode
+>BUFFER: undoe
+>CURSOR: 5
+
+ zletest $'one\euatwo\e0clthree'
+0:vi mode undo of initial and subsequent change
+>BUFFER: threewo
+>CURSOR: 5
+
+ zletest $'xxx\euiyyy\euAz'
+0:undo invoked twice
+>BUFFER: z
+>CURSOR: 1
+
+ comptesteval 'bindkey -a "^R" redo'
+ zletest $'123\C-_\e\C-r'
+0:undo in insert mode, redo in command
+>BUFFER: 123
+>CURSOR: 2
+
+ comptesteval 'bindkey "^Y" redo'
+ zletest $'pre\eA123\C-_\C-y\eu'
+0:undo and redo in insert mode, undo in command
+>BUFFER: pre
+>CURSOR: 2
+
+ comptesteval 'bindkey "^Gu" split-undo'
+ zletest $'one\C-gutwo\eu'
+0:split the undo sequence
+>BUFFER: one
+>CURSOR: 2
+
zletest $'one two\ebmt3|`tx``'
0:setting mark and returning to original position
>BUFFER: one wo
diff --git a/Test/comptest b/Test/comptest
index 10814d6..f1c5af0 100644
--- a/Test/comptest
+++ b/Test/comptest
@@ -72,8 +72,8 @@ zle-finish () {
print -lr "<WIDGET><finish>" "BUFFER: $BUFFER" "CURSOR: $CURSOR"
(( region_active )) && print -lr "MARK: $MARK"
zle -K main
- zle kill-whole-line
zle clear-screen
+ zle send-break
zle -R
}
zle -N expand-or-complete-with-report
next prev parent reply other threads:[~2014-02-05 22:07 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.
2014-02-05 22:00 ` Oliver Kiddle [this message]
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=2811.1391637633@thecus.kiddle.eu \
--to=okiddle@yahoo.co.uk \
--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).