X-Git-Url: https://git.distorted.org.uk/~mdw/profile/blobdiff_plain/0e1d5f0a9646589f744a7570f8249a3bcde5d7d0..11ee833744b07596b4b9e3896889706beae1f16a:/dot/gnus-local.el.distorted

diff --git a/dot/gnus-local.el.distorted b/dot/gnus-local.el.distorted
index c208d0f..fae39a3 100644
--- a/dot/gnus-local.el.distorted
+++ b/dot/gnus-local.el.distorted
@@ -137,6 +137,7 @@
 	  (to "\\<\\(hostmaster\\)@" "admin.dns" t)
 	  (to "\\<\\(news\\|newsmaster\\|usenet\\)@" "admin.news" t)
 	  (to "\\<\\(postmaster\\|spamd\\|mailer-daemon\\)@" "admin.mail" t)
+	  (to "\\<\\(mailman-owner\\)@" "admin.mail" t)
 	  (to "\\<\\(irc\\|blight\\|ircbot\\)@" "admin.irc" t)
 	  (to "\\<\\(www\\|webmaster\\|mtos\\)@" "admin.web" t)
 	  (to "\\<\\(ftp\\|ftpadmin\\|mirror\\)@" "admin.ftp" t)
@@ -155,7 +156,7 @@
 
 	  ;; Mailing lists, not split out earlier.
 	  (to "python-list@python\\.org" "lists.python")
-	  (to ,(concat "\\(jump-\\(announce\\|discuss\\)\\)@"
+	  (to ,(concat "\\(jump-\\(announce\\|discuss\\|vps\\)\\)@"
 		       "\\(lists\\.\\)?" "jump\\.net\\.uk")
 	      "lists.\\1")
 	  (to "cambridgecryptowhiskyclub@gmail\\.com"
@@ -169,6 +170,7 @@
 	  (from "@warwick\\.ac\\.uk\\>" "lists.warwick-uni" t)
 	  (to "chiark-\\(motd\\|announce\\)@chiark\\.greenend\\.org\\.uk"
 	      "lists.chiark-announce")
+	  (to "sot@dotat\\.at" "lists.sot" t)
 	  (any "clive-cambridge-gamers@nsict\\.org" "lists.nsict-games")
 
 	  ;; Per-sender addresses.
@@ -188,22 +190,24 @@
 	  (from "expiry@letsencrypt\\.org" "admin.letsencrypt")
 
 	  ;; Other splits I've not given a per-sender address.
-	  (from "@\\(.*\\.\\)?lovefilm\\.com\\>" "crap.lovefilm" t)
+	  (from "@\\([^.]+\\.\\)?aegon" "crap.aegon" t)
 	  (from "@\\(.*\\.\\)?amazon\\." "crap.amazon" t)
+	  (from "@\\(.*\\.\\)?primevideo\\." "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 "@\\(.*\\.\\)?spotify\\(mail\\)?\\.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 "@\\(.*\\.\\)?gandi\\.net\\>" "crap.gandi" t)
+	  (from "@accounts\\.google\\.com\\>" "crap.google" t)
 	  (from "campaigns@jolla\\.com\\>" "crap.jolla" t)
+	  (from "@\\(.*\\.\\)?lovefilm\\.com\\>" "crap.lovefilm" t)
+	  (from "@mythic-beasts\\.com\\>" "crap.mythic-beasts" t)
+	  (from "@\\([^.]+\\.\\)?nationwide" "crap.nationwide" t)
+	  (from "nationwide@securesuiteemail\\.com\\>" "crap.nationwide" t)
+	  (from "@action\\.openrightsgroup\\.org\\>" "crap.org" t)
+	  (from "@picturehouses\\.co\\.uk\\>" "crap.picturehouse" t)
+	  (from "@\\(.*\\.\\)?spotify\\(mail\\)?\\.com\\>" "crap.spotify" t)
 	  (from "@thomann\\.de\\>" "crap.thomann" t)
+	  (from "@tshirthell\\.com\\>" "crap.tshirt-hell" t)
 	  (from "@wikimedia\\.org\\>" "crap.wikimedia" t)
-	  (from "@\\(.*\\.\\)?gandi\\.net\\>" "crap.gandi" t)
-	  (from "@mythic-beasts\\.com\\>" "crap.mythic-beasts" t)
-	  (from "@accounts\\.google\\.com\\>" "crap.google" t)
 
 	  ;; Default.
 	  "mail.misc"))