dot/ercrc.el: Hack `mdw-pushnew-replace' for newer Emacsen.

[profile] / dot / gnus-local.el.distorted

diff --git a/dot/gnus-local.el.distorted b/dot/gnus-local.el.distorted
index 466296c..7407e89 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.
 
@@ -54,20 +56,25 @@
 (setq gnus-secondary-select-methods
       '((nnimap "distorted"
                (nnimap-address "mail.distorted.org.uk")
-               (nnimap-stream tls)
-               (nnimap-authinfo-file "~/.gnus.authinfo"))
+               (nnimap-stream starttls)
+               (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-stream starttls)
+               (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-stream starttls)
+               (starttls-extra-arguments ("--insecure"))
+               (nnimap-inbox "INBOX")
+               (nnimap-unsplittable-articles (%Deleted)))
        (nnimap "google"
                (nnimap-address "imap.gmail.com")
                (nnimap-stream tls)
-               (nnimap-authinfo-file "~/.gnus.authinfo"))))
+               (nnimap-inbox "INBOX")
+               (nnimap-unsplittable-articles (%Deleted)))))
 
 ;; Send sent mail back to me.
 (setq gnus-message-archive-method "mail"
@@ -125,6 +132,7 @@
          (from "cron daemon" "admin.misc")
          (from "uucp@distorted\\.org\\.uk" "admin.uucp")
          (from "darchive@.*\\.distorted\\.org\\.uk" "admin.misc")
+         (from "support@aa\\.net\\.uk" "admin.aaisp")
          (from "bugs@distorted\\.org\\.uk" "admin.bugs")
 
          ;; Colo provider.