From 75972f61f5e27d119899d5d00ddec9c7b54ba1aa Mon Sep 17 00:00:00 2001
From: Derek Wyatt <dwyatt@rim.com>
Date: Tue, 20 Mar 2012 08:16:44 -0400
Subject: [PATCH] A plugin that makes it easier to interact with the (single)
 running instance of gvim

---
 plugins/vim-interaction/README.md                  | 13 -------------
 plugins/vim-interaction/vim-interaction.plugin.zsh |  9 ++-------
 2 files changed, 2 insertions(+), 20 deletions(-)

diff --git a/plugins/vim-interaction/README.md b/plugins/vim-interaction/README.md
index 681648018..65e678b51 100644
--- a/plugins/vim-interaction/README.md
+++ b/plugins/vim-interaction/README.md
@@ -25,19 +25,6 @@ There are a few aliases presented as well:
 * `vvsp` Edits the passed in file but first makes a vertical split
 * `vhsp` Edits the passed in file but first makes a horizontal split
 
-## Post Callout ##
-
-At the end of the `callvim` function we invoke the `postCallVim` function if it
-exists.  If you're using MacVim, for example, you could define a function that
-brings window focus to it after the file is loaded:
-
-    function postCallVim
-    {
-      osascript -e 'tell application "MacVim" to activate'
-    }
-
-This'll be different depending on your OS / Window Manager.
-
 ## Examples ##
 
 This will load `/tmp/myfile.scala` into the running GVim session:
diff --git a/plugins/vim-interaction/vim-interaction.plugin.zsh b/plugins/vim-interaction/vim-interaction.plugin.zsh
index 5142f1f9b..3f346dfc3 100644
--- a/plugins/vim-interaction/vim-interaction.plugin.zsh
+++ b/plugins/vim-interaction/vim-interaction.plugin.zsh
@@ -8,10 +8,8 @@ function resolveFile
 {
   if [ -f "$1" ]; then
     echo $(readlink -f "$1")
-  elif [[ "${1#/}" == "$1" ]]; then
-    echo "$(pwd)/$1"
   else
-    echo $1
+    echo "$1"
   fi
 }
 
@@ -30,7 +28,7 @@ EOH
   fi
 
   local cmd=""
-  local before="<esc>"
+  local before=""
   local after=""
   while getopts ":b:a:" option
   do
@@ -58,9 +56,6 @@ EOH
   fi
   cmd="$before$files$after"
   gvim --remote-send "$cmd"
-  if typeset -f postCallVim > /dev/null; then
-    postCallVim
-  fi
 }
 
 alias v=callvim