X-Git-Url: https://git.distorted.org.uk/~mdw/profile/blobdiff_plain/daeece4beeba2316d11910130f4476cb9ac8efb2..89d694792680cfad4e7dad5bf1a7bbe8eabe83b9:/dot/shell-rc

diff --git a/dot/shell-rc b/dot/shell-rc
index 968bd73..940f91b 100644
--- a/dot/shell-rc
+++ b/dot/shell-rc
@@ -61,8 +61,10 @@ __mdw_set_prompt_pieces () {
     *) sec_l="" sec_r=""
   esac
 
-  ## If this is an schroot environment then point this out.
+  ## If this is an schroot environment or some other interesting augmented
+  ## environment then point this out.
   hqual="$hqual${SCHROOT_CHROOT_NAME+/$SCHROOT_CHROOT_NAME}"
+  hqual="$hqual${MDW_BUILDENV+/$MDW_BUILDENV}"
 
   ## Put together the main pieces.
   __mdw_prompt_left="$nl$bold$left$sec_l$u$host$hqual$sec_r$dir"
@@ -131,6 +133,7 @@ alias e="$EDITOR"
 alias svn="svnwrap svn"
 alias @="ssh"
 alias make="nice make"
+alias gdb="gdb -q"
 
 ###--------------------------------------------------------------------------
 ### Colour output.
@@ -161,6 +164,21 @@ alias egrep="greplike egrep"
 alias fgrep="greplike fgrep"
 alias zgrep="greplike zgrep"
 
+## Arrange for `diff' output to be in colour.
+export DIFF_COLORS="hd=1:ln=36:ad=32:de=31"
+difflike () {
+  local diff=$1; shift
+  if [ -t 1 ]; then
+    command $diff \
+	    ${DIFF_COLORS+--color=always} \
+	    ${DIFF_COLORS+--palette="$DIFF_COLORS"} \
+	    "$@" | mdw-pager
+  else
+    command $diff "$@" | cat
+  fi
+}
+alias diff="difflike diff"
+
 ###--------------------------------------------------------------------------
 ### Other hacks.