git://git.iain.cx/iain
/
profile.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Handle uncluttered buffers.
[profile.git]
/
.profile.d
/
p4.bashrc
diff --git
a/.profile.d/p4.bashrc
b/.profile.d/p4.bashrc
index
53967d1
..
93627f1
100644
(file)
--- a/
.profile.d/p4.bashrc
+++ b/
.profile.d/p4.bashrc
@@
-1,4
+1,3
@@
-# $Id$
if [ ! -z "$SUDO_USER" ]; then
export P4USER=$SUDO_USER
export P4TICKETS=/tmp/.p4tickets.$SUDO_USER
if [ ! -z "$SUDO_USER" ]; then
export P4USER=$SUDO_USER
export P4TICKETS=/tmp/.p4tickets.$SUDO_USER
@@
-7,9
+6,13
@@
else
fi
export P4CONFIG=.p4config
export P4DIFF="diff -u"
fi
export P4CONFIG=.p4config
export P4DIFF="diff -u"
-export P4EDITOR="vim -S '$HOME/.vim/script/p4'"
+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'"
else
if [ -z "$DISPLAY" ]; then
export P4MERGE="vim -o -c '3wincmd j' -c 'wincmd L'"
else
- export P4MERGE="p4
v -
merge"
+ export P4MERGE="p4merge"
fi
fi