about summary refs log tree commit diff
diff options
context:
space:
mode:
authorBarton E. Schaefer <schaefer@zsh.org>2016-02-14 11:35:18 -0800
committerBarton E. Schaefer <schaefer@zsh.org>2016-02-14 11:35:18 -0800
commite54578ff74754b70e230106d292eb645f61176f1 (patch)
tree37230be5ba48558b31dcd1ad5c1885e3df61aa35
parentf07a1bd00935b53e73dcbec4e039aef7cc1996b1 (diff)
downloadzsh-e54578ff74754b70e230106d292eb645f61176f1.tar.gz
zsh-e54578ff74754b70e230106d292eb645f61176f1.tar.xz
zsh-e54578ff74754b70e230106d292eb645f61176f1.zip
37971: fix potential issues when interacting with user-defined widgets
Cf. users/21284: Eric Freese
-rw-r--r--ChangeLog4
-rw-r--r--Functions/Zle/bracketed-paste-magic4
2 files changed, 6 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 18e4eed59..a081f0ad4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2016-02-14  Barton E. Schaefer  <schaefer@zsh.org>
 
+	* 37971 (cf. users/21284: Eric Freese):
+	Functions/Zle/bracketed-paste-magic: fix potential issues when
+	interacting with user-defined widgets
+	
 	* 37961: Src/Zle/complist.c: in interactive menuselection, use of
 	"compadd -x" (e.g. the "warnings" zstyle) may have replaced the
 	completion list, so skip highlighting of the current selection
diff --git a/Functions/Zle/bracketed-paste-magic b/Functions/Zle/bracketed-paste-magic
index 2b2bc630d..498cf554d 100644
--- a/Functions/Zle/bracketed-paste-magic
+++ b/Functions/Zle/bracketed-paste-magic
@@ -175,7 +175,7 @@ bracketed-paste-magic() {
 		case $REPLY in
 		    (${~bpm_active}) function () {
 			emulate -L $bpm_emulate; set -$bpm_opts
-			zle $REPLY
+			zle $REPLY -w
 		    };;
 		    (*) zle .self-insert;;
 		esac
@@ -184,7 +184,7 @@ bracketed-paste-magic() {
 	PASTED=$BUFFER
 
 	# Reset the undo state
-	zle undo $bpm_undo
+	zle .undo $bpm_undo
 	UNDO_LIMIT_NO=$bpm_limit
 
 	zle -K $bpm_keymap