mirrors/zsh
1
0
Fork 0
mirror of git://git.code.sf.net/p/zsh/code synced 2025-01-01 05:16:05 +01:00
Code Releases Activity

40115: revert 38579 due to bug restoring BUFFER after history search

Browse source 
This reverts commit 20948d0889.
This commit is contained in:
Zhiming Wang 2016-12-06 21:37:30 -08:00 committed by Barton E. Schaefer
parent 88d12b809a
commit 3594f55fc0
2 changed files with 28 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
ChangeLog
View file

@ -1,5 +1,8 @@
2016-12-06 Barton E. Schaefer <schaefer@zsh.org> 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 * 40110: Test/B02typeset.ztst: ignore strerror text in test
output, it differs by OS output, it differs by OS

44
Functions/Zle/bracketed-paste-magic
View file

@ -145,26 +145,27 @@ bracketed-paste-magic() {
done done
fi 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 zstyle -a :bracketed-paste-magic inactive-keys bpm_inactive
if zstyle -s :bracketed-paste-magic active-widgets bpm_active '|'; then if zstyle -s :bracketed-paste-magic active-widgets bpm_active '|'; then
# Save context, create a clean slate for the paste # There are active widgets. Reprocess $PASTED as keystrokes.
integer bpm_mark=$MARK bpm_region=$REGION_ACTIVE NUMERIC=1
integer bpm_numeric=${NUMERIC:-1} zle -U - $PASTED
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
if [[ $bmp_keymap = vicmd ]]; then if [[ $bmp_keymap = vicmd ]]; then
zle -K viins zle -K viins
fi fi
# There are active widgets. Reprocess $PASTED as keystrokes.
NUMERIC=1
zle -U - "$PASTED"
# Just in case there are active undo widgets # 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 while [[ -n $PASTED ]] && zle .read-command; do
PASTED=${PASTED#$KEYS} PASTED=${PASTED#$KEYS}
@ -182,16 +183,21 @@ bracketed-paste-magic() {
done done
PASTED=$BUFFER PASTED=$BUFFER
# Restore state # Reset the undo state
zle -K $bpm_keymap
fc -P
MARK=$bpm_mark
REGION_ACTIVE=$bpm_region
NUMERIC=$bpm_numeric
zle .undo $bpm_undo zle .undo $bpm_undo
UNDO_LIMIT_NO=$bpm_limit UNDO_LIMIT_NO=$bpm_limit
zle -K $bpm_keymap
fi 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 # PASTED has been updated, run the paste-finish functions
if zstyle -a :bracketed-paste-magic paste-finish bpm_hooks; then if zstyle -a :bracketed-paste-magic paste-finish bpm_hooks; then
for bpm_func in $bpm_hooks; do for bpm_func in $bpm_hooks; do