X-Git-Url: http://git.iain.cx/?a=blobdiff_plain;f=.profile.d%2Fp4.bashrc;h=736d7e498f3e3a574c778d508224d744071e0d09;hb=a35e8ca463e14772e3634291187553567bdc77f1;hp=285095169f10c0172aa3c448ab732df58691145f;hpb=3bbd083d605c075a4c7735ae0c836a76e6a77873;p=profile.git

diff --git a/.profile.d/p4.bashrc b/.profile.d/p4.bashrc
index 2850951..736d7e4 100644
--- a/.profile.d/p4.bashrc
+++ b/.profile.d/p4.bashrc
@@ -8,18 +8,20 @@ fi
 export P4CONFIG=.p4config
 eval $(alias diff 2>/dev/null | sed 's/^alias diff/P4DIFF/')
 export P4DIFF="${P4DIFF:-diff} -u"
-P4EDITOR=vim
+eval $(alias vim 2>/dev/null | sed 's/^alias vim/p4vim/')
+p4vim=${p4vim:-vim}
+P4EDITOR="$p4vim"
 p4script=$(find_target_profile ".vim/script/p4")
-[ -n "$p4script" ] && P4EDITOR="vim -S '$p4script'"
+[ -n "$p4script" ] && P4EDITOR="$p4vim -S '$p4script'"
 export P4EDITOR
 if [ -z "$DISPLAY" ]; then
   p4script=$(find_target_profile ".vim/script/merge")
   if [ -n "$p4script" ]; then
-    export P4MERGE="vim -S '$p4script'"
+    export P4MERGE="$p4vim -S '$p4script'"
   else
-    export P4MERGE="vim -o -c '3wincmd j' -c 'wincmd L'"
+    export P4MERGE="$p4vim -o -c '3wincmd j' -c 'wincmd L'"
   fi
 else
   export P4MERGE="p4merge"
 fi
-unset p4script
+unset p4script p4vim