From: Mikael Magnusson <mikachu@gmail.com>
To: zsh-workers@zsh.org
Subject: PATCH: narrow-to-region: Use unique parameter names for new feature
Date: Mon, 22 Jun 2015 03:36:29 +0200 [thread overview]
Message-ID: <1434936989-22728-1-git-send-email-mikachu@gmail.com> (raw)
Turns out _ntr_[lr]buffer were already used, so rename these. (Not just
for fun, it did actually not work without this change).
---
Functions/Zle/narrow-to-region | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/Functions/Zle/narrow-to-region b/Functions/Zle/narrow-to-region
index c65c80c..8b88da4 100644
--- a/Functions/Zle/narrow-to-region
+++ b/Functions/Zle/narrow-to-region
@@ -24,7 +24,7 @@
emulate -L zsh
setopt extendedglob
-local _ntr_lbuffer _ntr_rbuffer
+local _ntr_lbuf_return _ntr_rbuf_return
local _ntr_predisplay=$PREDISPLAY _ntr_postdisplay=$POSTDISPLAY
integer _ntr_start _ntr_end _ntr_swap _ntr_cursor=$CURSOR _ntr_mark=$MARK
integer _ntr_stat
@@ -34,7 +34,7 @@ local _ntr_nonempty _ntr_save _ntr_restore _ntr_lbuffer _ntr_rbuffer
while getopts "l:np:P:r:R:S:" _ntr_opt; do
case $_ntr_opt in
- (l) _ntr_lbuffer=$OPTARG
+ (l) _ntr_lbuf_return=$OPTARG
;;
(n) _ntr_nonempty=1
;;
@@ -42,7 +42,7 @@ while getopts "l:np:P:r:R:S:" _ntr_opt; do
;;
(P) _ntr_posttext=$OPTARG _ntr_useposttext=1
;;
- (r) _ntr_rbuffer=$OPTARG
+ (r) _ntr_rbuf_return=$OPTARG
;;
(R) _ntr_restore=$OPTARG
;;
@@ -108,8 +108,8 @@ if [[ -z $_ntr_save && -z $_ntr_restore ]]; then
zle recursive-edit
_ntr_stat=$?
- [[ -n $_ntr_lbuffer ]] && eval "${_ntr_lbuffer}=\${LBUFFER}"
- [[ -n $_ntr_rbuffer ]] && eval "${_ntr_rbuffer}=\${RBUFFER}"
+ [[ -n $_ntr_lbuf_return ]] && eval "${_ntr_lbuf_return}=\${LBUFFER}"
+ [[ -n $_ntr_rbuf_return ]] && eval "${_ntr_rbuf_return}=\${RBUFFER}"
fi
if [[ -n $_ntr_restore || -z $_ntr_save ]]; then
--
2.4.0
reply other threads:[~2015-06-22 1:36 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=1434936989-22728-1-git-send-email-mikachu@gmail.com \
--to=mikachu@gmail.com \
--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).