From 29b055466608edd981732f1820d3c97a35d9ff67 Mon Sep 17 00:00:00 2001 From: Sorin Ionescu Date: Fri, 4 Feb 2011 23:23:14 -0500 Subject: [PATCH] Vastly improved vi-mode plugin. --- plugins/vi-mode/vi-mode.plugin.zsh | 77 +++++++++++++++++++++++------- 1 file changed, 61 insertions(+), 16 deletions(-) diff --git a/plugins/vi-mode/vi-mode.plugin.zsh b/plugins/vi-mode/vi-mode.plugin.zsh index c47ab72..0848047 100644 --- a/plugins/vi-mode/vi-mode.plugin.zsh +++ b/plugins/vi-mode/vi-mode.plugin.zsh @@ -1,22 +1,67 @@ +# ------------------------------------------------------------------------------ +# FILE: vi-mode.plugin.zsh +# DESCRIPTION: oh-my-zsh plugin file. +# AUTHOR: Sorin Ionescu (sorin.ionescu@gmail.com) +# VERSION: 1.0.2 +# ------------------------------------------------------------------------------ + + +# Allow command line editing in an external editor. +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%}" +fi + function zle-line-init zle-keymap-select { zle reset-prompt } -zle -N zle-line-init -zle -N zle-keymap-select - -bindkey -v - -# if mode indicator wasn't setup by theme, define default -if [[ "$MODE_INDICATOR" == "" ]]; then - MODE_INDICATOR="%{$fg_bold[red]%}<%{$fg[red]%}<<%{$reset_color%}" -fi - -function vi_mode_prompt_info() { - echo "${${KEYMAP/vicmd/$MODE_INDICATOR}/(main|viins)/}" +# 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 +function zle-line-init zle-keymap-select { + if [[ "$KEYMAP" == 'vicmd' ]]; then + rprompt_cached="$RPROMPT" + RPROMPT="$MODE_INDICATOR" + elif [[ -n "$rprompt_cached" ]]; then + RPROMPT="$rprompt_cached" + rprompt_cached="" + fi + zle reset-prompt } -# define right prompt, if it wasn't defined by a theme -if [[ "$RPS1" == "" && "$RPROMPT" == "" ]]; then - RPS1='$(vi_mode_prompt_info)' -fi +# Accept RETURN in vi command mode. +function accept_line { + if [[ -n "$rprompt_cached" ]]; then + RPROMPT="$rprompt_cached" + rprompt_cached="" + fi + builtin zle .accept-line +} + +zle -N zle-line-init +zle -N zle-keymap-select +zle -N accept_line +zle -N edit-command-line + +# Avoid binding ^J, ^M, ^C, ^?, ^S, ^Q, etc. +bindkey -d # Reset to default. +bindkey -v # Use vi key bindings. +bindkey -M vicmd "^M" accept_line # Alow RETURN in vi command. +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 +