diff options
| author | Mikael Magnusson <mikachu@gmail.com> | 2015-06-22 03:34:48 +0200 |
|---|---|---|
| committer | Mikael Magnusson <mikachu@gmail.com> | 2015-06-22 03:37:29 +0200 |
| commit | ea0f612c3ad8fa1b4dea2245ce107e751c8e06d6 (patch) | |
| tree | 506cb3661e9109e0f865e16f24e1f0a75faad015 /Functions | |
| parent | f91644c9caafbdfdeca60fc0628acde603aeade0 (diff) | |
| download | zsh-ea0f612c3ad8fa1b4dea2245ce107e751c8e06d6.tar.gz zsh-ea0f612c3ad8fa1b4dea2245ce107e751c8e06d6.tar.xz zsh-ea0f612c3ad8fa1b4dea2245ce107e751c8e06d6.zip | |
35558: narrow-to-region: Use unique parameter names for new feature
Diffstat (limited to 'Functions')
| -rw-r--r-- | Functions/Zle/narrow-to-region | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Functions/Zle/narrow-to-region b/Functions/Zle/narrow-to-region index c65c80cb9..8b88da4a9 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 |