From 3fa9dff013182a5bbe1e19d8134ad788359895a8 Mon Sep 17 00:00:00 2001 From: Sorin Ionescu Date: Sat, 30 Jul 2011 01:59:05 -0400 Subject: [PATCH] Added new key bindings to vi-mode plugin. --- plugins/vi-mode/vi-mode.plugin.zsh | 67 +++++++++++++++++++++++------- 1 file changed, 52 insertions(+), 15 deletions(-) diff --git a/plugins/vi-mode/vi-mode.plugin.zsh b/plugins/vi-mode/vi-mode.plugin.zsh index 0848047..f9aafb9 100644 --- a/plugins/vi-mode/vi-mode.plugin.zsh +++ b/plugins/vi-mode/vi-mode.plugin.zsh @@ -1,8 +1,8 @@ # ------------------------------------------------------------------------------ # FILE: vi-mode.plugin.zsh # DESCRIPTION: oh-my-zsh plugin file. -# AUTHOR: Sorin Ionescu (sorin.ionescu@gmail.com) -# VERSION: 1.0.2 +# AUTHOR: Sorin Ionescu +# VERSION: 1.0.3 # ------------------------------------------------------------------------------ @@ -11,13 +11,9 @@ autoload -Uz edit-command-line # If mode indicator wasn't setup by theme, define a default. if [[ "$MODE_INDICATOR" == "" ]]; then - MODE_INDICATOR="%{$fg_bold[red]%}<%{$reset_color%}%{$fg[red]%}<<%{$reset_color%}" + MODE_INDICATOR="%B%F{red}<%f%b%F{red}<<%f" fi -function zle-line-init zle-keymap-select { - zle reset-prompt -} - # If I am using vi keys, I want to know what mode I'm currently using. # zle-keymap-select is executed every time KEYMAP changes. # From http://zshwiki.org/home/examples/zlewidgets @@ -55,13 +51,54 @@ bindkey -M vicmd v edit-command-line # ESC-v to edit in an external editor. bindkey ' ' magic-space bindkey -M vicmd "gg" beginning-of-history bindkey -M vicmd "G" end-of-history -bindkey -M vicmd "k" history-search-backward -bindkey -M vicmd "j" history-search-forward -bindkey -M vicmd "?" history-incremental-search-backward -bindkey -M vicmd "/" history-incremental-search-forward -bindkey -M viins "^L" clear-screen -bindkey -M viins "^W" backward-kill-word -bindkey -M viins "^A" beginning-of-line -bindkey -M viins "^E" end-of-line +# Bind to history substring search plugin if enabled; +# otherwise, bind to built-in ZSH history search. +if (( $+plugins[(er)history-substring-search] )); then + bindkey -M vicmd "k" history-substring-search-up + bindkey -M vicmd "j" history-substring-search-down +else + bindkey -M vicmd "k" history-search-backward + bindkey -M vicmd "j" history-search-forward +fi + +bindkey "^P" up-line-or-search +bindkey -M vicmd "k" up-line-or-search +bindkey -M vicmd "^k" up-line-or-search +bindkey -M viins "^k" up-line-or-search +bindkey "^N" down-line-or-search +bindkey -M vicmd "j" down-line-or-search +bindkey -M vicmd "^j" down-line-or-search +bindkey -M viins "^j" down-line-or-search + +bindkey -M viins '^r' history-incremental-pattern-search-backward +bindkey -M viins '^f' history-incremental-pattern-search-forward +bindkey -M vicmd "?" history-incremental-pattern-search-backward +bindkey -M vicmd "/" history-incremental-pattern-search-forward + +bindkey -M vicmd "^l" clear-screen +bindkey -M viins "^l" clear-screen + +bindkey -M vicmd "^w" backward-kill-word +bindkey -M viins "^w" backward-kill-word + +bindkey -M vicmd "^a" beginning-of-line +bindkey -M viins "^a" beginning-of-line + +bindkey -M vicmd "^e" end-of-line +bindkey -M viins "^e" end-of-line + +bindkey -M vicmd '^d' delete +bindkey -M viins '^d' delete + +bindkey -M vicmd '^?' backward-delete-char +bindkey -M viins '^?' backward-delete-char + +# 'jj' = ESC +bindkey -M viins 'jj' vi-cmd-mode + +if (( ${+functions[rationalize-dot]} )); then + bindkey -M viins '.' rationalize-dot + bindkey -M isearch . self-insert 2>/dev/null +fi