about summary refs log tree commit diff
diff options
context:
space:
mode:
authorBarton E. Schaefer <schaefer@zsh.org>2015-10-27 20:29:07 -0700
committerBarton E. Schaefer <schaefer@zsh.org>2015-10-27 20:29:07 -0700
commitaba7c00698fdd459d2f17f84ed371413458afae5 (patch)
tree705b3c6ace17a483442040baacc380d9965c8df8
parent0920bc6881af979ec538c8ab635c07f52601de4b (diff)
downloadzsh-aba7c00698fdd459d2f17f84ed371413458afae5.tar.gz
zsh-aba7c00698fdd459d2f17f84ed371413458afae5.tar.xz
zsh-aba7c00698fdd459d2f17f84ed371413458afae5.zip
36994: declare local REPLY for use with "zle .read-command"; use .self-insert instead of .self-insert-unmeta
-rw-r--r--ChangeLog6
-rw-r--r--Functions/Zle/bracketed-paste-magic6
2 files changed, 9 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index b10cf06ab..b5da1df4e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2015-10-27  Barton E. Schaefer  <schaefer@zsh.org>
+
+	* 36994: Functions/Zle/bracketed-paste-magic: declare local REPLY
+	for use with "zle .read-command"; use .self-insert instead of
+	.self-insert-unmeta
+
 2015-10-27  Peter Stephenson  <p.stephenson@samsung.com>
 
 	* 36982: Doc/Zsh/expn.yo, Src/pattern.c, Test/D02glob.ztst,
diff --git a/Functions/Zle/bracketed-paste-magic b/Functions/Zle/bracketed-paste-magic
index 2368bc315..2b2bc630d 100644
--- a/Functions/Zle/bracketed-paste-magic
+++ b/Functions/Zle/bracketed-paste-magic
@@ -122,7 +122,7 @@ bracketed-paste-magic() {
 	return
     else
 	# Capture the pasted text in $PASTED
-	local PASTED
+	local PASTED REPLY
 	zle .bracketed-paste PASTED
     fi
 
@@ -170,14 +170,14 @@ bracketed-paste-magic() {
 	while [[ -n $PASTED ]] && zle .read-command; do
 	    PASTED=${PASTED#$KEYS}
 	    if [[ $KEYS = ${(~j:|:)${(b)bpm_inactive}} ]]; then
-		zle .self-insert-unmeta
+		zle .self-insert
 	    else
 		case $REPLY in
 		    (${~bpm_active}) function () {
 			emulate -L $bpm_emulate; set -$bpm_opts
 			zle $REPLY
 		    };;
-		    (*) zle .self-insert-unmeta;;
+		    (*) zle .self-insert;;
 		esac
 	    fi
 	done