diff options
| author | Frank Terbeck <ft@bewatermyfriend.org> | 2013-04-05 20:39:52 +0200 |
|---|---|---|
| committer | Frank Terbeck <ft@bewatermyfriend.org> | 2013-04-05 21:05:54 +0200 |
| commit | e619a7353ad32934d680140e54358c835276ca2e (patch) | |
| tree | bea5f097607e1abf23da15336f4301a03bc731e8 | |
| parent | abb32da0e76791dbf4aff9758caf10579b3035cb (diff) | |
| download | zsh-e619a7353ad32934d680140e54358c835276ca2e.tar.gz zsh-e619a7353ad32934d680140e54358c835276ca2e.tar.xz zsh-e619a7353ad32934d680140e54358c835276ca2e.zip | |
31222: Stop {up,down}-line-or-beginning-search from triggering warn_create_global
This is a followup to 30995 taking Peter's suggestions from 30997 into account.
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | Functions/Zle/down-line-or-beginning-search | 2 | ||||
| -rw-r--r-- | Functions/Zle/up-line-or-beginning-search | 2 |
3 files changed, 8 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog index ad475b0aa..4bc3bc4ae 100644 --- a/ChangeLog +++ b/ChangeLog @@ -12,6 +12,10 @@ * 31221: Completion/Unix/Command/_git: Handle zero defined aliases better + * 31222: Functions/Zle/down-line-or-beginning-search, + Functions/Zle/up-line-or-beginning-search: Don't trigger + warn_create_global + 2013-04-04 Peter Stephenson <p.stephenson@samsung.com> * 31203: Completion/Unix/Command/.distfiles, diff --git a/Functions/Zle/down-line-or-beginning-search b/Functions/Zle/down-line-or-beginning-search index fbd2c3341..4c713f197 100644 --- a/Functions/Zle/down-line-or-beginning-search +++ b/Functions/Zle/down-line-or-beginning-search @@ -3,6 +3,8 @@ emulate -L zsh +typeset -g __searching __savecursor + if [[ ${+NUMERIC} -eq 0 && ( $LASTWIDGET = $__searching || $RBUFFER != *$'\n'* ) ]] then diff --git a/Functions/Zle/up-line-or-beginning-search b/Functions/Zle/up-line-or-beginning-search index 5348e7ad3..bdc39335a 100644 --- a/Functions/Zle/up-line-or-beginning-search +++ b/Functions/Zle/up-line-or-beginning-search @@ -3,6 +3,8 @@ emulate -L zsh +typeset -g __searching __savecursor + if [[ $LBUFFER == *$'\n'* ]]; then zle .up-line-or-history __searching='' |