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

diff --git a/dot/gnus-local.el.distorted b/dot/gnus-local.el.distorted
index 1ea2487..9fbace1 100644
--- a/dot/gnus-local.el.distorted
+++ b/dot/gnus-local.el.distorted
@@ -144,19 +144,29 @@
 	  (from "darchive@.*\\.distorted\\.org\\.uk" "admin.misc")
 	  (from "support@aa\\.net\\.uk" "admin.aaisp")
 	  (from "bugs@distorted\\.org\\.uk" "admin.bugs")
+	  (from "darchive@distorted\\.org\\.uk" "admin.darchive")
 
-	  ;; Colo provider.
+	  ;; Colo and network provider.
 	  (from "\\(accounts\\|support\\)@jump\\.net\\.uk" "keep.colo")
+	  (from "\\(accounts\\|support\\)@aa\\.net\\.uk" "keep.aaisp")
 
 	  ;; Mailing lists, not split out earlier.
 	  (to "python-list@python\\.org" "lists.python")
-	  (to "\\(jump-\\(announce\\|discuss\\)\\)@\\(lists\\.\\)jump\\.net\\.uk"
-	      "lists.jump-\\1")
+	  (to ,(concat "\\(jump-\\(announce\\|discuss\\)\\)@"
+		       "\\(lists\\.\\|\\)" "jump\\.net\\.uk")
+	      "lists.\\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 ,(concat "@" "\\(" "liberty-human-rights"
+			     "\\|" "libertyhumanrights"
+			     "\\|" "libertymail"
+			     "\\)" "\\.org\\.uk" "\\>")
+		"lists.liberty" t)
 	  (from "@openrightsgroup\\.org\\>" "lists.org" t)
+	  (from "@warwick\\.ac\\.uk\\>" "lists.warwick-uni" t)
+	  (to "chiark-\\(motd\\|announce\\)@chiark\\.greenend\\.org\\.uk"
+	      "lists.chiark-announce")
+	  (any "clive-cambridge-gamers@nsict\\.org" "lists.nsict-games")
 
 	  ;; Per-sender addresses.
 	  (to "\\<mdw-nospam-justgviing@" "crap.justgiving" t)
@@ -186,6 +196,10 @@
 	  (from "unlimited@cineworld\\.com\\>" "crap.cineworld" t)
 	  (from "@tshirthell\\.com\\>" "crap.tshirt-hell" t)
 	  (from "campaigns@jolla\\.com\\>" "crap.jolla" t)
+	  (from "@thomann\\.de\\>" "crap.thomann" t)
+	  (from "@wikimedia\\.org\\>" "crap.wikimedia" t)
+	  (from "@gandi\\.net\\>" "crap.gandi" t)
+	  (from "@mythic-beasts\\.com\\>" "crap.mythic-beasts" t)
 
 	  ;; Default.
 	  "mail.misc"))