diff options
| author | Oliver Kiddle <opk@zsh.org> | 2016-06-09 22:58:45 +0200 |
|---|---|---|
| committer | Oliver Kiddle <opk@zsh.org> | 2016-06-09 22:58:45 +0200 |
| commit | 20948d088994dc7b26a26b94926432985fa6863e (patch) | |
| tree | 0d7790570c896cc1b59d7109ae68dda665dc976d | |
| parent | d2a140e75d8956ac80e5b243065fe88f792901b2 (diff) | |
| download | zsh-20948d088994dc7b26a26b94926432985fa6863e.tar.gz zsh-20948d088994dc7b26a26b94926432985fa6863e.tar.xz zsh-20948d088994dc7b26a26b94926432985fa6863e.zip | |
38579: simplify saving and restoring of state
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | Functions/Zle/bracketed-paste-magic | 44 |
2 files changed, 22 insertions, 25 deletions
diff --git a/ChangeLog b/ChangeLog index 5063796f8..8c8a08948 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2016-06-09 Oliver Kiddle <opk@zsh.org> + * 38579: Functions/Zle/bracketed-paste-magic: simplify saving + and restoring of state + * 38641: Completion/Base/Utility/_values: allow for values which resemble compadd options diff --git a/Functions/Zle/bracketed-paste-magic b/Functions/Zle/bracketed-paste-magic index cafe18ed7..cf3cc6a59 100644 --- a/Functions/Zle/bracketed-paste-magic +++ b/Functions/Zle/bracketed-paste-magic @@ -145,27 +145,26 @@ 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 - # There are active widgets. Reprocess $PASTED as keystrokes. - NUMERIC=1 - zle -U - $PASTED - + # 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 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} @@ -183,21 +182,16 @@ bracketed-paste-magic() { done PASTED=$BUFFER - # Reset the undo state + # Restore state + zle -K $bpm_keymap + fc -P + MARK=$bpm_mark + REGION_ACTIVE=$bpm_region + NUMERIC=$bpm_numeric 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 |