From e5ea7321936322231fc19d4a0ed2ff175c7c6143 Mon Sep 17 00:00:00 2001
From: Iain Patterson <me@iain.cx>
Date: Mon, 26 Apr 2010 11:01:54 +0100
Subject: [PATCH] Ensure VISUAL is set when becoming.

---
 .profile.d/variables.bashrc | 1 -
 .profile.d/vim.bashrc       | 6 ++++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/.profile.d/variables.bashrc b/.profile.d/variables.bashrc
index e3d8f04..e13ecae 100644
--- a/.profile.d/variables.bashrc
+++ b/.profile.d/variables.bashrc
@@ -2,7 +2,6 @@ export SSHTERM=urxvtc
 export SSHTERM_TITLE=-title
 export SSHTERM_EXEC=-e
 unset LANG
-export VISUAL=vim
 unset XMODIFIERS #:-(
 export SSHTERM="urxvt"
 export SSHTERM_TITLE="-title"
diff --git a/.profile.d/vim.bashrc b/.profile.d/vim.bashrc
index bd9c826..15b4008 100644
--- a/.profile.d/vim.bashrc
+++ b/.profile.d/vim.bashrc
@@ -1,10 +1,12 @@
 vim=$(find_working vim 2>/dev/null)
 if [ $? = 0 ]; then
   if [ -n "$PROFILE_HOME" ]; then
-    alias vim="$vim --cmd ':se rtp=$PROFILE_HOME/.vim,\$VIMRUNTIME' -u $PROFILE_HOME/.vimrc"
+    VISUAL="$vim --cmd ':se rtp=$PROFILE_HOME/.vim,\$VIMRUNTIME' -u $PROFILE_HOME/.vimrc"
   else
-    alias vim="$vim"
+    VISUAL="$vim"
   fi
   alias vi="vim"
+  alias vim="$VISUAL"
+  export VISUAL
 fi
 unset vim
-- 
2.20.1