Consolidate vi-mode display in prompt

diff --git a/zsh/.zshrc b/zsh/.zshrc
index 2f04f405d7c11c5f137d809fe317200896c54a45..a3ea22949fe45abb8c3f005934d84b4534412645 100644 (file)
--- a/zsh/.zshrc
+++ b/zsh/.zshrc
@@ -50,13 +50,13 @@ bindkey -M isearch "^[[B" history-incremental-pattern-search-forward
 
 # Prompt {{{
 function zle-line-init zle-keymap-select {
-    mode_vi=${${KEYMAP/vicmd/+}/(main|viins)/-}
-    [[ $timer ]] && timer_show=$(( $SECONDS - $timer ))
+    local state="%#" timer_val="?"
+    [[ ${KEYMAP} == vicmd ]] && state="+"
+    [[ $timer ]] && timer_val=$(( $SECONDS - $timer ))
     prompt="%2~ "
-    prompt+="%U${timer_show}%u|"
+    prompt+="%U${timer_val}%u|"
     prompt+="%B%?%b"
-    prompt+="${mode_vi}"
-    prompt+="%B%F{magenta}%#%f%b "
+    prompt+="%B%F{magenta}${state}%f%b "
     PS1=$prompt
     zle reset-prompt
 }