X-Git-Url: http://git.iain.cx/?p=profile.git;a=blobdiff_plain;f=.profile.d%2Fp4.bashrc;h=736d7e498f3e3a574c778d508224d744071e0d09;hp=c44932accd6fab905674ecb4e0535a13b1bbac9f;hb=e082b7ddc9c8ad1fc763566b5e6bbd72b7ff26db;hpb=f00d519dd073659e3a079be65c57d5b64cb60a69

diff --git a/.profile.d/p4.bashrc b/.profile.d/p4.bashrc
index c44932a..736d7e4 100644
--- a/.profile.d/p4.bashrc
+++ b/.profile.d/p4.bashrc
@@ -1,3 +1,4 @@
+# profile-required: vim.bashrc
 if [ ! -z "$SUDO_USER" ]; then
   export P4USER=$SUDO_USER
   export P4TICKETS=/tmp/.p4tickets.$SUDO_USER
@@ -7,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