From: Oliver Kiddle <okiddle@yahoo.co.uk>
To: zsh workers <zsh-workers@zsh.org>
Subject: Re: PATCH: narrow-to-region (was Re: This widget implementation feels a bit clunky)
Date: Mon, 20 Jul 2015 11:19:10 +0200 [thread overview]
Message-ID: <9927.1437383950@thecus.kiddle.eu> (raw)
In-Reply-To: <150719012304.ZM18439@torch.brasslantern.com>
Bart wrote:
> } It'd also be good for the function to use the new undo limit features.
>
> I was going to send a follow-up message about undo-ing and whether a call
> to split-undo is needed before (and/or after) the recursive-edit.
It is needed immediately after you've setup PREDISPLAY and emptied
BUFFER.
I would have been fairly sure of that answer but my own attempts to make
it work had failed so I went back to see again first. I now realise that
the problem I had is elsewhere. I've attached a very rudimentary patch to
narrow-to-region.
My main use of narrow-to-region is to retrieve history lines into the
middle of the current line. And it is just this situation that is
breaking it. When doing:
zle undo $_ntr_changeno
it is falling foul of the first line of unapplychange which is:
if(ch->hist != histline) {
and not undoing enough changes.
This is a consequence of the fix in 10328. If I comment out the two
lines of undo() which do else break; it appears to work fine and the
problem that 10328 targetted doesn't seem to come back. But it is hard
to know how that was failing at the time.
> Related, should -S / -R implicitly set undo points?
I've never used those two options and am not sure I quite understand
what they're for. At least not without digging in the archives. With the
patch below, it is fairly obviously broken for them because
_ntr_changeno is set in a different block from the one which does zle
undo to revert to it.
Oliver
diff --git a/Functions/Zle/narrow-to-region b/Functions/Zle/narrow-to-region
index 293f89b..ae4addd 100644
--- a/Functions/Zle/narrow-to-region
+++ b/Functions/Zle/narrow-to-region
@@ -29,8 +29,9 @@
emulate -L zsh
setopt extendedglob
-local _ntr_lbuf_return _ntr_rbuf_return
+local _ntr_new_lbuf _ntr_newrbuf _ntr_lbuf_return _ntr_rbuf_return
local _ntr_predisplay=$PREDISPLAY _ntr_postdisplay=$POSTDISPLAY
+integer _ntr_savelim=$UNDO_LIMIT_NO _ntr_changeno
integer _ntr_start _ntr_end _ntr_swap _ntr_cursor=$CURSOR _ntr_mark=$MARK
integer _ntr_stat
@@ -98,6 +99,7 @@ if [[ -n $_ntr_save || -z $_ntr_restore ]]; then
then
_ntr_posttext=$_ntr_rbuffer
fi
+ _ntr_changeno=$UNDO_CHANGE_NO
PREDISPLAY="$_ntr_predisplay$_ntr_pretext"
POSTDISPLAY="$_ntr_posttext$_ntr_postdisplay"
@@ -110,16 +112,25 @@ if [[ -n $_ntr_save || -z $_ntr_restore ]]; then
BUFFER=${BUFFER[_ntr_start+1,_ntr_end-1]}
CURSOR=$_ntr_cursor
MARK=$_ntr_mark
+ zle split-undo
fi
if [[ -z $_ntr_save && -z $_ntr_restore ]]; then
- zle recursive-edit
- _ntr_stat=$?
-
- [[ -n $_ntr_lbuf_return ]] &&
- builtin typeset -g ${_ntr_lbuf_return}="${LBUFFER}"
- [[ -n $_ntr_rbuf_return ]] &&
- builtin typeset -g ${_ntr_rbuf_return}="${RBUFFER}"
+ {
+ UNDO_LIMIT_NO=$UNDO_CHANGE_NO
+ zle recursive-edit
+ _ntr_stat=$?
+ _ntr_newlbuf="$LBUFFER"
+ _ntr_newrbuf="$RBUFFER"
+
+ [[ -n $_ntr_lbuf_return ]] &&
+ builtin typeset -g ${_ntr_lbuf_return}="${LBUFFER}"
+ [[ -n $_ntr_rbuf_return ]] &&
+ builtin typeset -g ${_ntr_rbuf_return}="${RBUFFER}"
+ } always {
+ zle undo $_ntr_changeno
+ UNDO_LIMIT_NO=_ntr_savelim
+ }
fi
if [[ -n $_ntr_restore || -z $_ntr_save ]]; then
@@ -135,8 +146,8 @@ if [[ -n $_ntr_restore || -z $_ntr_save ]]; then
PREDISPLAY=$_ntr_predisplay
POSTDISPLAY=$_ntr_postdisplay
- LBUFFER="$_ntr_lbuffer$BUFFER"
- RBUFFER="$_ntr_rbuffer"
+ LBUFFER="$_ntr_lbuffer$_ntr_newlbuf"
+ RBUFFER="$_ntr_newrbuf$_ntr_rbuffer"
MARK=${#_ntr_lbuffer}
fi
next prev parent reply other threads:[~2015-07-20 9:25 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-06-20 9:16 This widget implementation feels a bit clunky (edit-quoted-word) Mikael Magnusson
2015-06-20 17:06 ` Peter Stephenson
2015-06-21 7:09 ` Mikael Magnusson
2015-06-21 17:17 ` Peter Stephenson
2015-06-22 2:26 ` Mikael Magnusson
2015-06-22 0:18 ` PATCH: Document narrow-to-region -l and -r Mikael Magnusson
2015-06-20 17:21 ` This widget implementation feels a bit clunky (edit-quoted-word) Bart Schaefer
2015-07-18 23:42 ` PATCH: narrow-to-region (was Re: This widget implementation feels a bit clunky) Bart Schaefer
2015-07-19 3:55 ` Oliver Kiddle
2015-07-19 8:23 ` Bart Schaefer
2015-07-20 9:19 ` Oliver Kiddle [this message]
2015-07-20 16:29 ` Bart Schaefer
2015-07-23 5:41 ` Undo and narrow-to-region (was Re: PATCH: narrow-to-region (was ...)) Bart Schaefer
2015-07-27 15:44 ` Oliver Kiddle
2015-08-12 17:00 ` PATCH: Re: Undo and narrow-to-region (was ...) Oliver Kiddle
2015-08-17 21:15 ` Daniel Hahler
2015-08-17 21:58 ` Bart Schaefer
2015-08-18 3:43 ` Bart Schaefer
2015-08-18 7:05 ` 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=9927.1437383950@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).