1 files changed, 5 insertions, 4 deletions

diff --git a/gist b/gist
index b54aaaa..4a22ed6 100755
--- a/gist
+++ b/gist
@@ -153,7 +153,7 @@ _process_json() {
 
 # Handle configuration cases
 _configure() {
-  [[ $# == 0 ]] && ${EDITOR:-vi} $CONFIG && return 0
+  [[ $# == 0 ]] && ${EDITOR} $CONFIG && return 0
 
   local key=$1; local value="$2"; valid_configs=${VALID_CONFIGS[@]}
   [[ ! ${key} =~ ^(${valid_configs// /|})$ ]] \
@@ -207,9 +207,6 @@ _validate_config() {
     echo 'To get user starred gists, a token is needed' >&2 && return 1
     _ask_token
   fi
-
-  [[ -z $folder || ! -w $(dirname "$folder") ]] && folder=~/gist && mkdir -p $folder
-  INDEX=$folder/index; [[ -e $INDEX ]] || touch $INDEX
 }
 
 # Apply current configuration into config file
@@ -241,6 +238,10 @@ _apply_config() {
   _validate_config "$@" || return 1
   _reformat_config
 
+  [[ -z $folder || ! -w $(dirname "$folder") ]] && folder=~/gist && mkdir -p $folder
+  INDEX=$folder/index; [[ -e $INDEX ]] || touch $INDEX
+  EDITOR=${EDITOR:-$(type vim &>/dev/null && echo vim || echo vi)}
+
   getConfiguredClient
 }