diff options
author | Peter Stephenson <pws@zsh.org> | 2014-07-17 09:45:46 +0100 |
---|---|---|
committer | Peter Stephenson <pws@zsh.org> | 2014-07-17 09:45:46 +0100 |
commit | 4e54648add79f7cb0c0fe81e46f49817d4555f2a (patch) | |
tree | 669c9f8b699ff260666265387b5923215a848dc3 /Functions/Zle/read-from-minibuffer | |
parent | 7d5db0d27785c61b8056c405a8ae31ec3a4eb01d (diff) | |
download | zsh-4e54648add79f7cb0c0fe81e46f49817d4555f2a.tar.gz zsh-4e54648add79f7cb0c0fe81e46f49817d4555f2a.tar.xz zsh-4e54648add79f7cb0c0fe81e46f49817d4555f2a.zip |
32866: new replace-argument ZLE function.
Also a couple of read-from-minibuffer fixes: don't pass numeric argument to recursive edit, and hide the minibuffer edit from the undo history.
Diffstat (limited to 'Functions/Zle/read-from-minibuffer')
-rw-r--r-- | Functions/Zle/read-from-minibuffer | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/Functions/Zle/read-from-minibuffer b/Functions/Zle/read-from-minibuffer index 57e926884..8fec1105e 100644 --- a/Functions/Zle/read-from-minibuffer +++ b/Functions/Zle/read-from-minibuffer @@ -20,7 +20,9 @@ done (( OPTIND > 1 )) && shift $(( OPTIND - 1 )) local readprompt="$1" lbuf_init="$2" rbuf_init="$3" +integer changeno=$UNDO_CHANGE_NO +{ # Use anonymous function to make sure special values get restored, # even if this function is called as a widget. # local +h ensures special parameters stay special. @@ -39,10 +41,17 @@ local readprompt="$1" lbuf_init="$2" rbuf_init="$3" read -k $keys stat=$? else + local NUMERIC + unset NUMERIC zle recursive-edit -K main stat=$? (( stat )) || REPLY=$BUFFER fi } +} always { + # This removes the edits relating to the read from the undo history. + # These aren't useful once we get back to the main editing buffer. + zle undo $changeno +} return $stat |