From 64da1ed6271c709e5b73cdf32774bdaf3ae4bb34 Mon Sep 17 00:00:00 2001
From: Sorin Ionescu <sorin.ionescu@gmail.com>
Date: Mon, 9 Apr 2012 18:46:48 -0400
Subject: [PATCH] Rename $editor_keymap_info to $editor_info[keymap]

---
 modules/editor/init.zsh                     | 11 ++++++++---
 modules/prompt/functions/prompt_sorin_setup |  2 +-
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/modules/editor/init.zsh b/modules/editor/init.zsh
index db92f52..bec3c99 100644
--- a/modules/editor/init.zsh
+++ b/modules/editor/init.zsh
@@ -44,7 +44,7 @@ zle -N edit-command-line
 
 # Use human-friendly identifiers.
 zmodload zsh/terminfo
-typeset -gA key_info
+typeset -gA key_info editor_info
 key_info=(
   'Control'   '\C-'
   'Escape'    '\e'
@@ -86,10 +86,15 @@ done
 # Displays the current vi mode.
 function zle-line-init zle-line-finish zle-keymap-select {
   if [[ "$KEYMAP" == 'vicmd' ]]; then
-    zstyle -s ':omz:module:editor:keymap' alternate 'editor_keymap_info'
+    zstyle -s ':omz:module:editor:keymap' alternate 'REPLY'
   else
-    zstyle -s ':omz:module:editor:keymap' primary 'editor_keymap_info'
+    zstyle -s ':omz:module:editor:keymap' primary 'REPLY'
   fi
+
+  editor_info[keymap]="$REPLY"
+
+  unset REPLY
+
   zle reset-prompt
   zle -R
 }
diff --git a/modules/prompt/functions/prompt_sorin_setup b/modules/prompt/functions/prompt_sorin_setup
index a46ffbc..a0092a5 100644
--- a/modules/prompt/functions/prompt_sorin_setup
+++ b/modules/prompt/functions/prompt_sorin_setup
@@ -46,7 +46,7 @@ function prompt_sorin_setup {
     '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) '
-  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]? '
 }