Merge branch 'master' of git.distorted.org.uk:~mdw/publish/public-git/profile
authorMark Wooding <mdw@distorted.org.uk>
Thu, 2 Jun 2016 17:11:32 +0000 (18:11 +0100)
committerMark Wooding <mdw@distorted.org.uk>
Thu, 2 Jun 2016 17:11:32 +0000 (18:11 +0100)
commitb6f657376564f477ad08e0a3f4f063872ebd8b44
treedc0cdaf22ae143b6427698da134bd7484218939c
parent190975c0bed630f1b808b7ebce86ae12228e5bb7
parentb8e4b4a9bf62a7f03a2e4b087bf80ea496814821
Merge branch 'master' of git.distorted.org.uk:~mdw/publish/public-git/profile

* 'master' of git.distorted.org.uk:~mdw/publish/public-git/profile:
  el/dot-emacs.el: Don't raise frame when reminding about appointments.
  dot/emacs: Expunge `try-expand-list' from the expanders.
  dot/emacs: Move `hippie-expand' to another (related) key.
  el/dot-emacs.el (mdw-trustonic-c): Support bizarre access-label indentation.
  dot/emacs, dot/vm: Hack the applications used for viewing content.
  dot/vm: Remove list of ancient email addresses.
  git/gitignore: Ignore `build.*' as well as `build-*'.
  el/dot-emacs.el: Unelectrify `;' in `asm-mode'.
  el/dot-emacs.el: Fix stupid typo.
  dot/emacs: Don't prompt about following symbolic links.
  dot/xinitrc: Document the new Emacs geometry parameters.
  dot/xinitrc: Calculate derived Emacs geometry after the version dispatch.