dot/emacs: Group `appt' settings into a single `setf' form.

[profile] / dot / shell-rc

diff --git a/dot/shell-rc b/dot/shell-rc
index 9754106..aad0918 100644 (file)
--- a/dot/shell-rc
+++ b/dot/shell-rc
@@ -64,7 +64,7 @@ __mdw_set_prompt_pieces () {
   ## 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+/$BUILDENV}"
+  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"
@@ -163,6 +163,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.