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
Fix corruption in fonts.conf and prefer DejaVu fonts.
[profile.git]
/
.profile.d
/
p4.bashrc
diff --git
a/.profile.d/p4.bashrc
b/.profile.d/p4.bashrc
index
b4134c0
..
736d7e4
100644
(file)
--- a/
.profile.d/p4.bashrc
+++ b/
.profile.d/p4.bashrc
@@
-1,3
+1,4
@@
+# profile-required: vim.bashrc
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,17
+8,20
@@
fi
export P4CONFIG=.p4config
eval $(alias diff 2>/dev/null | sed 's/^alias diff/P4DIFF/')
export P4DIFF="${P4DIFF:-diff} -u"
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
+eval $(alias vim 2>/dev/null | sed 's/^alias vim/p4vim/')
+p4vim=${p4vim:-vim}
+P4EDITOR="$p4vim"
+p4script=$(find_target_profile ".vim/script/p4")
+[ -n "$p4script" ] && P4EDITOR="$p4vim -S '$p4script'"
+export P4EDITOR
if [ -z "$DISPLAY" ]; then
if [ -z "$DISPLAY" ]; then
- if [ -e "$HOME/.vim/script/p4" ]; then
- export P4MERGE="vim -S '$HOME/.vim/script/p4'"
+ p4script=$(find_target_profile ".vim/script/merge")
+ if [ -n "$p4script" ]; then
+ export P4MERGE="$p4vim -S '$p4script'"
else
else
- export P4MERGE="vim -o -c '3wincmd j' -c 'wincmd L'"
+ export P4MERGE="
$p4
vim -o -c '3wincmd j' -c 'wincmd L'"
fi
else
export P4MERGE="p4merge"
fi
fi
else
export P4MERGE="p4merge"
fi
+unset p4script p4vim