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.

diff --git a/bg/twins.jpg b/bg/twins.jpg
new file mode 100644 (file)
index 0000000..0d5bbb5
Binary files /dev/null and b/bg/twins.jpg differ

diff --git a/dot/gnus-local.el.distorted b/dot/gnus-local.el.distorted
index 466296c..82cc344 100644 (file)
--- a/dot/gnus-local.el.distorted
+++ b/dot/gnus-local.el.distorted
@@ -5,6 +5,8 @@
 ;;; (c) 2014 Mark Wooding
 ;;;
 
+(setq auth-sources '("~/.gnus.authinfo"))
+
 ;;;--------------------------------------------------------------------------
 ;;; How to send mail.
 
@@ -55,19 +57,27 @@
       '((nnimap "distorted"
                (nnimap-address "mail.distorted.org.uk")
                (nnimap-stream tls)
-               (nnimap-authinfo-file "~/.gnus.authinfo"))
+               (nnimap-authinfo-file "~/.gnus.authinfo")
+               (nnimap-inbox "INBOX")
+               (nnimap-unsplittable-articles (%Deleted)))
        (nnimap "markw-distorted"
                (nnimap-address "mail.distorted.org.uk")
                (nnimap-stream tls)
-               (nnimap-authinfo-file "~/.gnus.authinfo.markw"))
+               (nnimap-authinfo-file "~/.gnus.authinfo.markw")
+               (nnimap-inbox "INBOX")
+               (nnimap-unsplittable-articles (%Deleted)))
        (nnimap "mwooding-chiark"
                (nnimap-address "imap.dovecot.chiark.greenend.org.uk")
                (nnimap-stream tls)
-               (nnimap-authinfo-file "~/.gnus.authinfo"))
+               (nnimap-authinfo-file "~/.gnus.authinfo")
+               (nnimap-inbox "INBOX")
+               (nnimap-unsplittable-articles (%Deleted)))
        (nnimap "google"
                (nnimap-address "imap.gmail.com")
                (nnimap-stream tls)
-               (nnimap-authinfo-file "~/.gnus.authinfo"))))
+               (nnimap-authinfo-file "~/.gnus.authinfo")
+               (nnimap-inbox "INBOX")
+               (nnimap-unsplittable-articles (%Deleted)))))
 
 ;; Send sent mail back to me.
 (setq gnus-message-archive-method "mail"