From 3b5f7fd5f176aed2f8a5690928e77c4b03bbf42d Mon Sep 17 00:00:00 2001
From: Hunter Haugen <h.haugen@gmail.com>
Date: Sun, 13 Mar 2011 16:32:00 -0700
Subject: [PATCH] More munging vim aliases

---
 .zshrc | 39 ++++++++++++++++++++-------------------
 1 file changed, 20 insertions(+), 19 deletions(-)

diff --git a/.zshrc b/.zshrc
index 6cf65cc..8e320c2 100644
--- a/.zshrc
+++ b/.zshrc
@@ -127,35 +127,36 @@ else
         export PERL5LIB=$PERL5LIB:~/local/lib/perl5:~/local/lib/perl5/site_perl
 fi
 
+## Set up vim aliases
 if whence vim > /dev/null ; then
-    export VISUAL=vim
-    export EDITOR=vim
-    if [ -n "$DISPLAY" ] ; then
-        alias gvim="gvim -font 'APL385 Unicode 8' -c 'set keymap=uniapl385'"
-        #alias vi=gvim
-    fi
+    VIM=vim
     if whence mvim > /dev/null ; then
-        export VISUAL="mvim -f"
-        export EDITOR="mvim -f"
-        alias vi=mvim
-        alias vr="mvim --remote"
-        alias vir=vr
-        vs() { mvim --servername $1 --remote $argv[2,$] }
-        alias vis=vs
-        alias vl="mvim --serverlist"
-    else
-        alias vi=vim
+        VIM=mvim
     fi
 else
-    export VISUAL=vi
-    export EDITOR=vi
+    VIM=vi
 fi
-alias v=vi
+export VISUAL="$VIM -f"
+export EDITOR="$VIM -f"
+alias v=$VIM
+alias vi=$VIM
+alias vr="$VIM --remote-tab"
+alias vl="$VIM --serverlist"
+vs() { $VIM --servername $1 --remote-tab $argv[2,$] }
+alias vir=vr
+alias vis=vs
+alias gvim="gvim -font 'APL385 Unicode 8' -c 'set keymap=uniapl385'"
+
+## For forwarding ssh auth I think
 if [ -n "$SSH_AUTH_SOCK" ] ; then
     ln -fs $SSH_AUTH_SOCK $HOME/.ssh-agent
 fi
+
+## Add extra fonts
 #xset fp+ /usr/APL2/fonts/X11
 #xset fp  rehash
+
+## Set up ruby gems for $RUBYLIB
 #if [ -d $HOME/.gems/gems ] ; then
 #    for rlib in $HOME/.gems/gems/*/lib ; do
 #        export RUBYLIB=$RUBYLIB:$rlib