Merge branch 'master' of git.distorted.org.uk:~mdw/publish/public-git/profile

* 'master' of git.distorted.org.uk:~mdw/publish/public-git/profile: (125 commits)
  dot/emacs: Align Org mode tags to the proper column in agenda view.
  el/dot-emacs.el: Distinguish whether diary entries are processed for Org.
  dot/emacs: Put `org-remember' in with the rest of the Org-mode bindings.
  dot/emacs: Better grip on when `M-x calendar' shows things.
  dot/emacs: File organizational stuff under `brain'.
  dot/emacs: Squish Debbugs-style email addresses to the submission address.
  dot/emacs: Don't snarf addresses from boring mailboxes.
  dot/gnus-local.el.distorted: Send letsencrypt.org nagmail away.
  dot/emacs: Pick the right master diary file.
  dot/tmux.conf: Some more bindings.
  dot/tmux.conf: Order roughly by key.
  dot/gnus-local.el.distorted: Set primary newsserver to chiark for now.
  el/dot-emacs.el: Add a (lightly modified) `nntp-open-authinfo-kludge'.
  el/dot-emacs.el: Trim leading spaces from diary entry strings.
  dot/emacs: Fix the date-format regexps to not eat a following time.
  dot/emacs: Display times in 24-hour clock, please.
  el/dot-emacs.el: Add Discordian date conversion.
  dot/emacs: Use newer diary hook functions if they're available.
  dot/emacs: Don't try to sort the diary buffer.
  dot/emacs, el/dot-emacs.el: Better Emacs version checking.
  ...

Conflicts:
	dot/bashrc: Various prompt enhancements.

diff --cc dot/bashrc
index f9485c0b3618b63efb568e9c12dbcb395120b8fe,6feeb4d9354fe8dbf257a5f2d5403b94f45a7bff..8dc678b308c1bf2e9830ed21326e8193b4f91141
--- 1/dot/bashrc
--- 2/dot/bashrc
+++ b/dot/bashrc
@@@ -69,19 -69,22 +69,23 @@@ if [ -t 0 ]; the
      sec_l='(' sec_r=')'
    fi
  
+   ## If this is an schroot environment then point this out.
+   hqual=""
+   hqual="$hqual${SCHROOT_CHROOT_NAME+/$SCHROOT_CHROOT_NAME}"
+ 
    ## Build the prompt string.
 -  if type __git_ps1 >/dev/null 2>&1; then
 -    git="$unbold$gitcolour\$(rc=\$?;__git_ps1;exit \$rc)$uncolour$bold"
 -  else
 -    git=""
 +  git="" rc=""
 +  if [[ ${BASH_VERSINFO[0]} -ge 4 ]]; then
 +    if type __git_ps1 >/dev/null 2>&1; then
 +      git="$unbold$gitcolour\$(rc=\$?;__git_ps1;exit \$rc)$uncolour$bold"
 +    fi
 +    rc="$unbold$rccolour\$(rc=\$?;case \$rc in 0);;"
 +    rc="$rc*)echo -n \" rc=\$rc\";;esac;exit \$rc)$uncolour$bold"
    fi
-   PS1="$nl$bold$left$sec_l$u\\h$sec_r \\w$git$rc$marker$right$unbold"
 -  rc="$unbold$rccolour\$(rc=\$?;case \$rc in 0);;"
 -  rc="$rc*)echo -n \" rc=\$rc\";;esac;exit \$rc)$uncolour$bold"
+   PS1="$nl$bold$left$sec_l$u\\h$hqual$sec_r \\w$git$rc$marker$right$unbold"
    PS2="$PS1 $bold>$unbold "
    unset nl bold unbold left right sec_l sec_r marker
-   unset gitcolour rccolour uncolour git rc
+   unset gitcolour rccolour uncolour git rc hqual
  fi
  
  ###--------------------------------------------------------------------------