From 3ce1caf15292617aaeadf37b5e6f08ff06a65cde Mon Sep 17 00:00:00 2001
From: elsdrm <elsdrm@gmail.com>
Date: Tue, 16 Dec 2014 00:44:25 +0800
Subject: [PATCH] Zsh's mode indicator behaves better.

---
 themes/bureau_elsdrm.zsh-theme | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/themes/bureau_elsdrm.zsh-theme b/themes/bureau_elsdrm.zsh-theme
index a70d0b22a..c6540d7db 100644
--- a/themes/bureau_elsdrm.zsh-theme
+++ b/themes/bureau_elsdrm.zsh-theme
@@ -2,8 +2,12 @@
 
 ### Initialization
 last_command=$? # Must come first!
-NORMAL_SYMBOL="%{$bg[red]%}%{$fg_bold[white]%}@%{$reset_color%}"
+NORMAL_SYMBOL='@'
 INSERT_SYMBOL='#'
+NORMAL_SYMBOL_PREFIX="%{$bg[red]%}%{$fg_bold[white]%}"
+NORMAL_SYMBOL_SUFFIX="%{$reset_color%}"
+INSERT_SYMBOL_PREFIX=""
+INSERT_SYMBOL_SUFFIX="%{$reset_color%}"
 ### NVM
 
 ZSH_THEME_NVM_PROMPT_PREFIX="%B⬡%b "
@@ -109,7 +113,7 @@ bureau_precmd () {
 }
 
 function zle-line-init zle-keymap-select {
-    _MODE_SYMBOL="${${KEYMAP/vicmd/$NORMAL_SYMBOL}/(main|viins)/$INSERT_SYMBOL}"
+    _MODE_SYMBOL="${${KEYMAP/vicmd/$NORMAL_SYMBOL_PREFIX$NORMAL_SYMBOL$NORMAL_SYMBOL_SUFFIX}/(main|viins)/$INSERT_SYMBOL_PREFIX$INSERT_SYMBOL$INSERT_SYMBOL_SUFFIX}"
     zle reset-prompt
 }