-# $Id$
if [ ! -z "$SUDO_USER" ]; then
export P4USER=$SUDO_USER
export P4TICKETS=/tmp/.p4tickets.$SUDO_USER
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"
+if [ -e "$HOME/.vim/script/p4" ]; then
+ export P4EDITOR="vim -S '$HOME/.vim/script/p4'"
+else
+ export P4EDITOR=vim
+fi
if [ -z "$DISPLAY" ]; then
- export P4MERGE="vim -o -c '3wincmd j' -c 'wincmd L'"
+ if [ -e "$HOME/.vim/script/p4" ]; then
+ export P4MERGE="vim -S '$HOME/.vim/script/p4'"
+ else
+ export P4MERGE="vim -o -c '3wincmd j' -c 'wincmd L'"
+ fi
else
- export P4MERGE="p4v -merge"
+ export P4MERGE="p4merge"
fi