From ea0f612c3ad8fa1b4dea2245ce107e751c8e06d6 Mon Sep 17 00:00:00 2001
From: Mikael Magnusson <mikachu@gmail.com>
Date: Mon, 22 Jun 2015 03:34:48 +0200
Subject: 35558: narrow-to-region: Use unique parameter names for new feature

---
 Functions/Zle/narrow-to-region | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'Functions/Zle')

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
-- 
cgit 1.4.1