diff options
| author | Zhiming Wang <zmwangx@gmail.com> | 2016-12-06 21:37:30 -0800 |
|---|---|---|
| committer | Barton E. Schaefer <schaefer@zsh.org> | 2016-12-06 21:37:30 -0800 |
| commit | 3594f55fc087c1272ec4a4f15f17dfb007a226ec (patch) | |
| tree | fdc8693c0364bf5a3fc3588c34dc0cd766d25b05 | |
| parent | 88d12b809a9f2111bb99ae339af51d0b78d4357f (diff) | |
| download | zsh-3594f55fc087c1272ec4a4f15f17dfb007a226ec.tar.gz zsh-3594f55fc087c1272ec4a4f15f17dfb007a226ec.tar.xz zsh-3594f55fc087c1272ec4a4f15f17dfb007a226ec.zip | |
40115: revert 38579 due to bug restoring BUFFER after history search
This reverts commit 20948d088994dc7b26a26b94926432985fa6863e.
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | Functions/Zle/bracketed-paste-magic | 44 |
2 files changed, 28 insertions, 19 deletions
diff --git a/ChangeLog b/ChangeLog index 8ec83337c..61c4c12d0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2016-12-06 Barton E. Schaefer <schaefer@zsh.org> + * Zhiming Wang: 40115: Functions/Zle/bracketed-paste-magic: + revert 38579 due to bug restoring BUFFER after history search + * 40110: Test/B02typeset.ztst: ignore strerror text in test output, it differs by OS diff --git a/Functions/Zle/bracketed-paste-magic b/Functions/Zle/bracketed-paste-magic index fb584d595..c46f741d5 100644 --- a/Functions/Zle/bracketed-paste-magic +++ b/Functions/Zle/bracketed-paste-magic @@ -145,26 +145,27 @@ bracketed-paste-magic() { done fi + # Save context, create a clean slate for the paste + integer bpm_mark=$MARK bpm_cursor=$CURSOR bpm_region=$REGION_ACTIVE + integer bpm_numeric=${NUMERIC:-1} + local bpm_buffer=$BUFFER + fc -p -a /dev/null 0 0 + BUFFER= + zstyle -a :bracketed-paste-magic inactive-keys bpm_inactive if zstyle -s :bracketed-paste-magic active-widgets bpm_active '|'; then - # Save context, create a clean slate for the paste - integer bpm_mark=$MARK bpm_region=$REGION_ACTIVE - integer bpm_numeric=${NUMERIC:-1} - integer bpm_limit=$UNDO_LIMIT_NO bpm_undo=$UNDO_CHANGE_NO - BUFFER= - CURSOR=1 - zle .split-undo - UNDO_LIMIT_NO=$UNDO_CHANGE_NO - fc -p -a /dev/null 0 0 + # There are active widgets. Reprocess $PASTED as keystrokes. + NUMERIC=1 + zle -U - $PASTED + if [[ $bmp_keymap = vicmd ]]; then zle -K viins fi - # There are active widgets. Reprocess $PASTED as keystrokes. - NUMERIC=1 - zle -U - "$PASTED" - # Just in case there are active undo widgets + zle .split-undo + integer bpm_limit=$UNDO_LIMIT_NO bpm_undo=$UNDO_CHANGE_NO + UNDO_LIMIT_NO=$UNDO_CHANGE_NO while [[ -n $PASTED ]] && zle .read-command; do PASTED=${PASTED#$KEYS} @@ -182,16 +183,21 @@ bracketed-paste-magic() { done PASTED=$BUFFER - # Restore state - zle -K $bpm_keymap - fc -P - MARK=$bpm_mark - REGION_ACTIVE=$bpm_region - NUMERIC=$bpm_numeric + # Reset the undo state zle .undo $bpm_undo UNDO_LIMIT_NO=$bpm_limit + + zle -K $bpm_keymap fi + # Restore state + BUFFER=$bpm_buffer + MARK=$bpm_mark + CURSOR=$bpm_cursor + REGION_ACTIVE=$bpm_region + NUMERIC=$bpm_numeric + fc -P + # PASTED has been updated, run the paste-finish functions if zstyle -a :bracketed-paste-magic paste-finish bpm_hooks; then for bpm_func in $bpm_hooks; do |