Merge branch 'master' of https://git.distorted.org.uk/~mdw/profile

* 'master' of https://git.distorted.org.uk/~mdw/profile:
  dot/emacs: Don't snarf `*@*.invalid' email addresses.
  dot/emacs: Don't have BBDB store mailer-daemon's address.
  dot/emacs: Propagate initial frame's background colour to other frames.
  dot/emacs: Pull in Org mode and BBDB explicitly when enabling appointments.
  dot/emacs: Don't do calendar/diary things if we're trying to start quickly.
  dot/xinitrc: Set `XSCR0_HEIGHT' correctly if `xscsize' is too old.
  dot/xinitrc: Overhaul the Emacs/terminal allocation algorithm.
  dot/xinitrc: Use $(( ... )) consistently for arithmetic evaluation.
  dot/xinitrc: Don't assume that the first screen starts at (0, 0).
  doc/xinitrc: Handle Emacs and terminal placement on multihead displays.
  dot/xinitrc: Decrease the amount of space reserved on the right.
  dot/xinitrc: Document the various terminal and Emacs size parameters.
  dot/xinitrc: Support for GNU Emacs 24.
  el/dot-emacs.el: Slight reformatting.

diff --cc dot/emacs
Simple merge