diff options
| author | Marc Cornellà <marc.cornella@live.com> | 2015-12-13 21:34:17 +0100 |
|---|---|---|
| committer | Marc Cornellà <marc.cornella@live.com> | 2015-12-13 21:34:17 +0100 |
| commit | 4d154abaa9abd46b6a4bbfa019413e155ef35ad2 (patch) | |
| tree | a50f37065f2e8ac1cda69f467ddf9bcd680350bd /plugins | |
| parent | 11de60fde96e4b5664bf51a6d10ee0c8ff3c93d6 (diff) | |
| parent | 45822e85c5b2e131d9898cf90710d7ea82006dea (diff) | |
| download | zsh-4d154abaa9abd46b6a4bbfa019413e155ef35ad2.tar.gz zsh-4d154abaa9abd46b6a4bbfa019413e155ef35ad2.tar.bz2 zsh-4d154abaa9abd46b6a4bbfa019413e155ef35ad2.zip | |
Merge branch 'apjanke-histsubstr-double-bind'
Close #4193
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/history-substring-search/history-substring-search.plugin.zsh | 9 | ||||
| -rwxr-xr-x | plugins/history-substring-search/update-from-upstream.zsh | 6 |
2 files changed, 10 insertions, 5 deletions
diff --git a/plugins/history-substring-search/history-substring-search.plugin.zsh b/plugins/history-substring-search/history-substring-search.plugin.zsh index 25fd3a2da..7883a65f3 100644 --- a/plugins/history-substring-search/history-substring-search.plugin.zsh +++ b/plugins/history-substring-search/history-substring-search.plugin.zsh @@ -13,11 +13,14 @@ fi # Bind terminal-specific up and down keys - +# Bind in both emacs and vi modes so it works in both, and is not +# sensitive to whether this is loaded before or after the vi-mode plugin if [[ -n "$terminfo[kcuu1]" ]]; then - bindkey "$terminfo[kcuu1]" history-substring-search-up + bindkey -M emacs "$terminfo[kcuu1]" history-substring-search-up + bindkey -M viins "$terminfo[kcuu1]" history-substring-search-up fi if [[ -n "$terminfo[kcud1]" ]]; then - bindkey "$terminfo[kcud1]" history-substring-search-down + bindkey -M emacs "$terminfo[kcud1]" history-substring-search-down + bindkey -M viins "$terminfo[kcud1]" history-substring-search-down fi diff --git a/plugins/history-substring-search/update-from-upstream.zsh b/plugins/history-substring-search/update-from-upstream.zsh index 6e6cca5d5..81e1942a5 100755 --- a/plugins/history-substring-search/update-from-upstream.zsh +++ b/plugins/history-substring-search/update-from-upstream.zsh @@ -76,10 +76,12 @@ cat >> $plugin_basename.plugin.zsh <<EOF # Bind terminal-specific up and down keys if [[ -n "\$terminfo[kcuu1]" ]]; then - bindkey "\$terminfo[kcuu1]" history-substring-search-up + bindkey -M emacs "\$terminfo[kcuu1]" history-substring-search-up + bindkey -M viins "\$terminfo[kcuu1]" history-substring-search-up fi if [[ -n "\$terminfo[kcud1]" ]]; then - bindkey "\$terminfo[kcud1]" history-substring-search-down + bindkey -M emacs "\$terminfo[kcud1]" history-substring-search-down + bindkey -M viins "\$terminfo[kcud1]" history-substring-search-down fi EOF |