export P4USER=$USER
fi
export P4CONFIG=.p4config
-export P4DIFF="diff -u"
+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