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: Better fontification for Ediff.
  dot/emacs: Set new variable for Python indent level.
  setup: Just symlink all of the backgrounds.
  bg/twins.jpg: The Twins: Kate and Grace Hoare, by John Everett Millais.
  dot/gnus-local.el.distorted: Changes to support later Gnus versions.

diff --combined dot/emacs
index 648c562b2f233baa771a37af9fa00aab5f3c209f,ce99762dd7640db7a54c0fc51105e63923c28fe3..5c567fac788f0347ebe323c0af27de82db069d3c
--- 1/dot/emacs
--- 2/dot/emacs
+++ b/dot/emacs
@@@ -208,8 -208,7 +208,8 @@@
        (lambda ()
        (let ((group gnus-newsgroup-name))
          (and (string-match "^nn\\(imap\\|folder\\)\\+" group)
 -             (not (string-match ":\\(crap\\|spam\\|lists\\)\\." group)))))
 +             (not (string-match ":\\(crap\\|spam\\|lists\\|corpus\\)\\."
 +                                group)))))
        bbdb-user-mail-names
        (concat "^"
              "\\(" "\\(mdw\\|markw\\|root\\|postmaster\\)"
@@@ -828,6 -827,7 +828,7 @@@
  (progn
    (setq-default py-indent-offset 2
                python-indent 2
+               python-indent-offset 2
                py-python-command-args
                `("-i" "-colors" ,(if mdw-black-background
                                      "Linux" "LightBG")))