X-Git-Url: http://git.iain.cx/?a=blobdiff_plain;f=.profile.d%2Fp4.bashrc;h=c44932accd6fab905674ecb4e0535a13b1bbac9f;hb=b3d373ad52b5671234fbe6361e509fef08ac2111;hp=94cd19c606b7a44c7c432714c012077dcc11477d;hpb=1d8d630522282efbefe26e1e8c5a150b9d51d276;p=profile.git

diff --git a/.profile.d/p4.bashrc b/.profile.d/p4.bashrc
index 94cd19c..c44932a 100644
--- a/.profile.d/p4.bashrc
+++ b/.profile.d/p4.bashrc
@@ -7,13 +7,18 @@ fi
 export P4CONFIG=.p4config
 eval $(alias diff 2>/dev/null | sed 's/^alias diff/P4DIFF/')
 export P4DIFF="${P4DIFF:-diff} -u"
-if [ -e "$HOME/.vim/script/p4" ]; then
-  export P4EDITOR="vim -S '$HOME/.vim/script/p4'"
-else
-  export P4EDITOR=vim
-fi
+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="p4merge"
 fi
+unset p4script