2 files changed, 3 insertions, 3 deletions

diff --git a/tigrc b/tigrc
index 3b7c2c7..5d64450 100644
--- a/tigrc
+++ b/tigrc
@@ -85,7 +85,7 @@ bind main F none
 bind generic <C-T> :toggle commit-title-refs
 
 # edit tigrc
-bind main e >sh -c "vim ~/.tigrc"
+bind main e >sh -c "$EDITOR ~/.tigrc"
 
 # move
 bind main <C-J> :move-next-merge
@@ -357,7 +357,7 @@ bind diff u @git checkout %(commit)^ -- %(file)
 #====================
 
 # edit tigrc
-bind help e >sh -c "vim ~/.tigrc"
+bind help e >sh -c "$EDITOR ~/.tigrc"
 
 #====================
 # color
diff --git a/zsh/zshrc b/zsh/zshrc
index 830ff57..5f8b29f 100644
--- a/zsh/zshrc
+++ b/zsh/zshrc
@@ -53,7 +53,7 @@ function precmd() {
   PROMPT='%B%(?:%F{green}%m%f:%K{red}%F{black}%m%f%k)%f%F{cyan} %c%f%b '
   RIGHT=$(NUM=$($SETTING_DIR/bin/git/check-repos.sh -n); (( $NUM != 0 )) && echo $NUM)
   _get_context
-  RPROMPT="%B%K{blue}%F{yellow} ${CONTEXT} %f%k%K{red}%F{black}${RIGHT}%f%k%b"
+  RPROMPT="%B%K{blue}%F{yellow}${CONTEXT:+ $CONTEXT }%f%k%K{red}%F{black}${RIGHT}%f%k%b"
   [ -n "$PRE_POPULATE" ] && print -z "$PRE_POPULATE"
 }