diff options
| author | Peter Stephenson <pws@users.sourceforge.net> | 2006-08-01 20:28:35 +0000 |
|---|---|---|
| committer | Peter Stephenson <pws@users.sourceforge.net> | 2006-08-01 20:28:35 +0000 |
| commit | 7d77bc95b2ba7276cf430a989e9b4000c72ba765 (patch) | |
| tree | c86eb5720ff5fe902aebf1d76d6ba4260dcc5352 | |
| parent | ba22472b7f16b696cc4251fab090652d31308e66 (diff) | |
| download | zsh-7d77bc95b2ba7276cf430a989e9b4000c72ba765.tar.gz zsh-7d77bc95b2ba7276cf430a989e9b4000c72ba765.tar.xz zsh-7d77bc95b2ba7276cf430a989e9b4000c72ba765.zip | |
22574: more history-beginning-search-menu fixes
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | Doc/Zsh/params.yo | 2 | ||||
| -rw-r--r-- | Functions/Zle/history-beginning-search-menu | 4 |
3 files changed, 9 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog index 4898d42aa..4a4795618 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2006-08-01 Peter Stephenson <p.w.stephenson@ntlworld.com> + + * 22574: Functions/Zle/history-beginning-search-menu, + Doc/Zsh/params.yo: ~ also needs quoting and we have to do + it even if space isn't active. + 2006-08-01 Peter Stephenson <pws@csr.com> * 22573: Functions/Zle/history-beginning-search-menu, diff --git a/Doc/Zsh/params.yo b/Doc/Zsh/params.yo index fe005ed21..6c637f93d 100644 --- a/Doc/Zsh/params.yo +++ b/Doc/Zsh/params.yo @@ -221,7 +221,7 @@ the tt(EXTENDED_GLOB) option is set, the following is sufficient to match an element of an array tt($array) containing exactly the value of tt($key): -example(key2=${key//(#m)[\][+LPAR()+RPAR()\\*?#<>]/\\$MATCH} +example(key2=${key//(#m)[\][+LPAR()+RPAR()\\*?#<>~]/\\$MATCH} print ${array[(R)$key2]}) ) item(tt(R))( diff --git a/Functions/Zle/history-beginning-search-menu b/Functions/Zle/history-beginning-search-menu index 46a6a776b..dadcc40cb 100644 --- a/Functions/Zle/history-beginning-search-menu +++ b/Functions/Zle/history-beginning-search-menu @@ -40,12 +40,12 @@ local -a display local search=$LBUFFER +search=${search//(#m)[\][()\\*?#<>~]/\\$MATCH/} if [[ $WIDGET = *-space* ]]; then # We need to quote metacharacters in the search string # since they are otherwise active in the reverse subscript. # We need to avoid quoting other characters since they aren't # and just stay quoted, rather annoyingly. - search=${search//(#m)[\][()\\*?#<>]/\\$MATCH/} search=${search// /*} fi @@ -112,7 +112,7 @@ fi # go to the last one. This allows accept-line-and-down-history etc. # to work. local -a lines -local matchq=${matches[$chars]//(#m)[\][()\\*?#<>]/\\$MATCH} +local matchq=${matches[$chars]//(#m)[\][()\\*?#<>~]/\\$MATCH} lines=(${(kon)history[(R)$matchq]}) HISTNO=$lines[-1] |