diff --git a/support-d/.bashrc b/support-d/.bashrc
index 531c44bdfc..eb32d36731 100644
--- a/support-d/.bashrc
+++ b/support-d/.bashrc
@@ -63,7 +63,11 @@ export LESS="-R"
 export CHARSET="ISO-8859-1"
 export PS1='\n\[\033[01;31m\]\u@\h\[\033[01;36m\] [\d \@] \[\033[01;33m\] \w\n\[\033[00m\]<\#>:'
 export PS2="\[\033[1m\]> \[\033[0m\]"
-export VISUAL=emacs
+if [ -f ~/.viplease ]; then
+    export VISUAL=vi
+else
+    export VISUAL=emacs
+fi
 export GIT_SSL_NO_VERIFY=true
 
 umask 022