summaryrefslogtreecommitdiff
path: root/plugins/history-substring-search/history-substring-search.plugin.zsh
diff options
context:
space:
mode:
authorMarc Cornellà <marc.cornella@live.com>2015-12-13 21:34:17 +0100
committerMarc Cornellà <marc.cornella@live.com>2015-12-13 21:34:17 +0100
commit4d154abaa9abd46b6a4bbfa019413e155ef35ad2 (patch)
treea50f37065f2e8ac1cda69f467ddf9bcd680350bd /plugins/history-substring-search/history-substring-search.plugin.zsh
parent11de60fde96e4b5664bf51a6d10ee0c8ff3c93d6 (diff)
parent45822e85c5b2e131d9898cf90710d7ea82006dea (diff)
downloadzsh-4d154abaa9abd46b6a4bbfa019413e155ef35ad2.tar.gz
zsh-4d154abaa9abd46b6a4bbfa019413e155ef35ad2.tar.bz2
zsh-4d154abaa9abd46b6a4bbfa019413e155ef35ad2.zip
Merge branch 'apjanke-histsubstr-double-bind'
Close #4193
Diffstat (limited to 'plugins/history-substring-search/history-substring-search.plugin.zsh')
-rw-r--r--plugins/history-substring-search/history-substring-search.plugin.zsh9
1 files changed, 6 insertions, 3 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