X-Git-Url: https://git.distorted.org.uk/~mdw/profile/blobdiff_plain/093f5ffa86eb0953d8e8fd3a7a27db71e4f9ee67..15efe2bca2dc2727cb73f889a316ebfaaaa4e8f0:/dot/gnus-local.el.distorted

diff --git a/dot/gnus-local.el.distorted b/dot/gnus-local.el.distorted
index cbb9c26..1ea2487 100644
--- a/dot/gnus-local.el.distorted
+++ b/dot/gnus-local.el.distorted
@@ -73,7 +73,9 @@
 (setq gnus-auto-expirable-newsgroups
       (concat "^"
 	      "\\(nnimap\\+[^:]+\\|nnvirtual\\):"
-	      "\\(admin\\|crap\\|lists\\|nag\\|spam\\)\\."))
+	      "\\(" "\\(admin\\|crap\\|lists\\|nag\\)\\."
+	      "\\|" "spam\\.oubliette"
+	      "\\)"))
 
 ;; My various email addresses.
 (setq message-alternative-emails bbdb-user-mail-names
@@ -91,6 +93,15 @@
 	 (address "distorted.mdw@gmail.com")
 	 ("X-mdw-Send-Mail" "gmail-smtp"))))
 
+(setq nnmail-split-abbrev-alist
+      (mdw-uniquify-alist
+       `((to . ,(concat "to\\|cc\\|apparently-to\\|envelope-to\\|"
+			"resent-to\\|resent-cc"))
+	 (any . ,(concat "from\\|sender\\|resent-from\\|"
+			 "to\\|cc\\|apparently-to\\|envelope-to\\|"
+			 "resent-to\\|resent-cc"))
+	 ,@nnmail-split-abbrev-alist)))
+
 (defvar mdw-odin-parse-regexp
   (concat "^"
 	  "\\S-+" "\\s-+"		; time limit
@@ -141,6 +152,11 @@
 	  (to "python-list@python\\.org" "lists.python")
 	  (to "\\(jump-\\(announce\\|discuss\\)\\)@\\(lists\\.\\)jump\\.net\\.uk"
 	      "lists.jump-\\1")
+	  (to "cambridgecryptowhiskyclub@gmail\\.com"
+	      "lists.cambridge-crypto-whisky")
+	  (from "@liberty-human-rights\\.org\\.uk\\>" "lists.liberty" t)
+	  (from "@libertymail\\.org\\.uk\\>" "lists.liberty" t)
+	  (from "@openrightsgroup\\.org\\>" "lists.org" t)
 
 	  ;; Per-sender addresses.
 	  (to "\\<mdw-nospam-justgviing@" "crap.justgiving" t)
@@ -156,22 +172,19 @@
 	  (from "\\<mailman-owner@" "nag.mailman" t)
 
 	  ;; Uninteresting mail.
-	  (from "expiry@letsencrypt\\.org" "spam.letsencrypt")
+	  (from "expiry@letsencrypt\\.org" "admin.letsencrypt")
 
 	  ;; Other splits I've not given a per-sender address.
-	  (from "@\\(.*\\.\\)?lovefilm\\.com\\>" "spam.lovefilm" t)
-	  (from "@\\(\\|.*\\.\\)amazon\\." "spam.amazon" t)
-	  (from "@cineworldmail\\.com\\>" "spam.cineworld" t)
-	  (from "@picturehouses\\.co\\.uk\\>" "spam.picturehouse" t)
-	  (from "@nationwide" "spam.nationwide\\>" t)
-	  (from "@news\\.spotifymail\\.com\\>" "spam.spotify" t)
-	  (from "@action\\.openrightsgroup\\.org\\>" "spam.org" t)
-	  (from "unlimited@cineworld\\.com\\>" "spam.cineworld" t)
-	  (from "nationwide@securesuiteemail\\.com\\>" "spam.nationwide" t)
-	  (from "@liberty-human-rights\\.org\\.uk\\>" "spam.liberty" t)
-	  (from "@libertymail\\.org\\.uk\\>" "spam.liberty" t)
-	  (from "@openrightsgroup\\.org\\>" "spam.org" t)
-	  (from "@tshirthell\\.com\\>" "spam.tshirt-hell" t)
+	  (from "@\\(.*\\.\\)?lovefilm\\.com\\>" "crap.lovefilm" t)
+	  (from "@\\(\\|.*\\.\\)amazon\\." "crap.amazon" t)
+	  (from "@cineworldmail\\.com\\>" "crap.cineworld" t)
+	  (from "@picturehouses\\.co\\.uk\\>" "crap.picturehouse" t)
+	  (from "@nationwide" "crap.nationwide" t)
+	  (from "nationwide@securesuiteemail\\.com\\>" "crap.nationwide" t)
+	  (from "@news\\.spotifymail\\.com\\>" "crap.spotify" t)
+	  (from "@action\\.openrightsgroup\\.org\\>" "crap.org" t)
+	  (from "unlimited@cineworld\\.com\\>" "crap.cineworld" t)
+	  (from "@tshirthell\\.com\\>" "crap.tshirt-hell" t)
 	  (from "campaigns@jolla\\.com\\>" "crap.jolla" t)
 
 	  ;; Default.