In screen/tmux locally, use non-graphical EDITOR/VISUAL.

bashrc

@@ -1127,26 +1127,36 @@ cdf() {
 
 # Set the default editor
 if [ -z "$SSH_CLIENT" ] ; then          # for local/console sessions
-  if command -v mvim >/dev/null ; then
-    case "$TERM_PROGRAM" in
-      Apple_Terminal) _terminal="Terminal"  ;;
-      iTerm.app)      _terminal="iTerm"     ;;
-    esac
-    export EDITOR="mvim -f -c \"au VimLeave * !open -a ${_terminal}\""
-    export BUNDLER_EDITOR="mvim"
-    unset _terminal
-  elif command -v gvim >/dev/null ; then
-    export EDITOR="gvim -f"
-    export BUNDLER_EDITOR="gvim"
-  elif command -v mate >/dev/null ; then
-    export EDITOR="mate -w"
-    export EDITOR="mate"
-  elif command -v vim >/dev/null ; then
-    export EDITOR="vim"
-    export BUNDLER_EDITOR="$EDITOR"
-  else
-    export EDITOR="vi"
-    export BUNDLER_EDITOR="$EDITOR"
+  if [[ "$TERM" == screen* ]] ; then    # we're in screen or tmux
+    if command -v vim >/dev/null ; then
+      export EDITOR="vim"
+      export BUNDLER_EDITOR="$EDITOR"
+    else
+      export EDITOR="vi"
+      export BUNDLER_EDITOR="$EDITOR"
+    fi
+  else                                  # we're on a normal term console
+    if command -v mvim >/dev/null ; then
+      case "$TERM_PROGRAM" in
+        Apple_Terminal) _terminal="Terminal"  ;;
+        iTerm.app)      _terminal="iTerm"     ;;
+      esac
+      export EDITOR="mvim -f -c \"au VimLeave * !open -a ${_terminal}\""
+      export BUNDLER_EDITOR="mvim"
+      unset _terminal
+    elif command -v gvim >/dev/null ; then
+      export EDITOR="gvim -f"
+      export BUNDLER_EDITOR="gvim"
+    elif command -v mate >/dev/null ; then
+      export EDITOR="mate -w"
+      export EDITOR="mate"
+    elif command -v vim >/dev/null ; then
+      export EDITOR="vim"
+      export BUNDLER_EDITOR="$EDITOR"
+    else
+      export EDITOR="vi"
+      export BUNDLER_EDITOR="$EDITOR"
+    fi
   fi
 else                                    # for remote/ssh sessions
   if command -v vim >/dev/null ; then