X-Git-Url: http://git.iain.cx/?a=blobdiff_plain;f=.profile.d%2Faliases.bashrc;h=3b3897b9ace11776573f1fa7c4cc09eb47a46e48;hb=95120cbd748ebe21f1cf944911632f9afdad1958;hp=c858a7aeda38588eb63c65642d2defe619716292;hpb=9a0363ff944bd7d46fc9ecddd2a51969d1eeea8a;p=profile.git

diff --git a/.profile.d/aliases.bashrc b/.profile.d/aliases.bashrc
index c858a7a..3b3897b 100644
--- a/.profile.d/aliases.bashrc
+++ b/.profile.d/aliases.bashrc
@@ -1,9 +1,11 @@
 # $Id$
-alias grep='grep --color=auto'
+grep -V 2>/dev/null | grep GNU >/dev/null && alias grep='grep --color=auto'
 alias knh='kill_known_host'
 alias l='ls'
 alias ls='/bin/ls $LS_OPTIONS'
-alias vim='vim +syn\ on'
-alias vi='vim'
+if which vim 2>/dev/null | grep ^/ >/dev/null; then
+  alias vim='vim +syn\ on'
+  alias vi='vim'
+fi
 alias debug='valgrind --tool=memcheck --leak-check=yes --show-reachable=yes --num-callers=5 --verbose --time-stamp=yes --track-fds=yes'
 alias svnfind='find . -type f ! -path "*/.svn/*"'