sqozz/prezto_config
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Rename $editor_keymap_info to $editor_info[keymap]

Browse source
This commit is contained in:
Sorin Ionescu 2012-04-09 18:46:48 -04:00
parent 9e6df0511e
commit 64da1ed627
2 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
modules/editor/init.zsh
View file

@ -44,7 +44,7 @@ zle -N edit-command-line
# Use human-friendly identifiers. # Use human-friendly identifiers.
zmodload zsh/terminfo zmodload zsh/terminfo
typeset -gA key_info typeset -gA key_info editor_info
key_info=( key_info=(
'Control' '\C-' 'Control' '\C-'
'Escape' '\e' 'Escape' '\e'
@ -86,10 +86,15 @@ done
# Displays the current vi mode. # Displays the current vi mode.
function zle-line-init zle-line-finish zle-keymap-select { function zle-line-init zle-line-finish zle-keymap-select {
if [[ "$KEYMAP" == 'vicmd' ]]; then if [[ "$KEYMAP" == 'vicmd' ]]; then
zstyle -s ':omz:module:editor:keymap' alternate 'editor_keymap_info' zstyle -s ':omz:module:editor:keymap' alternate 'REPLY'
else else
zstyle -s ':omz:module:editor:keymap' primary 'editor_keymap_info' zstyle -s ':omz:module:editor:keymap' primary 'REPLY'
fi fi
editor_info[keymap]="$REPLY"
unset REPLY
zle reset-prompt zle reset-prompt
zle -R zle -R
} }

2
modules/prompt/functions/prompt_sorin_setup
View file

@ -46,7 +46,7 @@ function prompt_sorin_setup {
'rprompt' '%A%B%S%a%d%m%r%U%u' 'rprompt' '%A%B%S%a%d%m%r%U%u'
PROMPT='%F{cyan}%1~%f${(e)git_info[prompt]} %(!.%B%F{red}#%f%b.%B%F{green}❯%f%b) ' PROMPT='%F{cyan}%1~%f${(e)git_info[prompt]} %(!.%B%F{red}#%f%b.%B%F{green}❯%f%b) '
RPROMPT='${editor_keymap_info}%(?:: %F{red}⏎%f)${VIM:+" %B%F{green}V%f%b"}${git_info[rprompt]}' RPROMPT='${editor_info[keymap]}%(?:: %F{red}⏎%f)${VIM:+" %B%F{green}V%f%b"}${git_info[rprompt]}'
SPROMPT='zsh: correct %F{red}%R%f to %F{green}%r%f [nyae]? ' SPROMPT='zsh: correct %F{red}%R%f to %F{green}%r%f [nyae]? '
} }