X-Git-Url: http://git.iain.cx/?a=blobdiff_plain;f=.profile.d%2Fp4.bashrc;h=c44932accd6fab905674ecb4e0535a13b1bbac9f;hb=8fbd163e15300ebf2df0789cf0a9c66b415c5ce1;hp=0422ee85858e4db642ecfdb4046a3061c38ce4f4;hpb=819bb88d5a014a23150b8fd609d194e883958674;p=profile.git

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