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 --combined dot/emacs
index bd00d20d45440f2889cb64fc67e074242edaa192,88acfe45ecfcc8c672a8425a7d88c97a28344139..d78302471d7b9bccb19ddbb2177d8c92bad68bb2
--- 1/dot/emacs
--- 2/dot/emacs
+++ b/dot/emacs
@@@ -122,6 -122,7 +122,7 @@@
  ;; Emacs server behaviour.
  
  (and (or window-system (mdw-emacs-version-p 23))
+      (not mdw-fast-startup)
       (progn (setq server-temp-file-regexp (concat "^" tmpdir "\\|/draft$")
                  edit-server-new-frame nil
                  gnuserv-frame t)
@@@ -199,7 -200,6 +200,7 @@@
      (trap (bbdb-initialize 'gnus 'sendmail 'message)))
  (setq bbdb-file "~/etc/brain/bbdb"
        bbdb-north-american-phone-numbers-p nil
 +      bbdb-dwim-net-address-allow-redundancy t
        bbdb-extract-address-components-func 'bbdb-extract-address-components
        bbdb/news-auto-create-p
        (lambda ()
@@@ -221,7 -221,9 +222,9 @@@
        (lambda (addr)
        (cond ((null addr)
               nil)
-             ((or (string-match (concat "^reply-[0-9a-f]+-[0-9a-f]+_"
+             ((or (string-match "^mailer-daemon@" addr)
+                  (string-match "\.invalid$" addr)
+                  (string-match (concat "^reply-[0-9a-f]+-[0-9a-f]+_"
                                         "HTML-[0-9]+-[0-9]+-[0-9]+"
                                         "@\\(nationwide-communications\\."
                                         "co\\.uk\\)$")
@@@ -456,7 -458,9 +459,9 @@@
  (setq appt-display-interval 3)
  (setq appt-message-warning-time 10)
  (and (not mdw-fast-startup)
-      (trap (appt-activate 1)))
+      (trap (require 'org)
+          (require 'bbdb)
+          (appt-activate 1)))
  
  ;; Org-mode agenda.
  
@@@ -476,7 -480,7 +481,7 @@@
  (display-time)
  (column-number-mode 1)
  (trap
-   (if window-system
+   (if (and window-system (not mdw-fast-startup))
        (let ((calendar-view-diary-initially-flag t))
        (calendar))))
  
@@@ -540,6 -544,9 +545,9 @@@
             (background-color . "black")
             (foreground-color . "white"))
        (nil (menu-bar-lines . 0))))
+ (let ((backg (frame-parameter nil 'background-color)))
+   (if (and backg window-system)
+       (push (cons 'background-color backg) default-frame-alist)))
  
  ;; Other frame fiddling.