X-Git-Url: https://git.distorted.org.uk/~mdw/profile/blobdiff_plain/272f4216f17489aa75f0228eba2122adea83a6d2..9ee82fbbdbc2a7ea10b8f7a1b4cb470abf60e792:/dot/gnus-local.el.distorted?ds=sidebyside

diff --git a/dot/gnus-local.el.distorted b/dot/gnus-local.el.distorted
index 2760bf2..a484554 100644
--- a/dot/gnus-local.el.distorted
+++ b/dot/gnus-local.el.distorted
@@ -73,7 +73,7 @@
 (setq gnus-auto-expirable-newsgroups
       (concat "^"
 	      "\\(nnimap\\+[^:]+\\|nnvirtual\\):"
-	      "\\(" "\\(admin\\|crap\\|lists\\|nag\\|spam\\)\\."
+	      "\\(" "\\(admin\\|crap\\|lists\\|nag\\)\\."
 	      "\\|" "spam\\.oubliette"
 	      "\\)"))
 
@@ -145,6 +145,9 @@
 	      "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)
@@ -160,22 +163,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 "nationwide@securesuiteemail\\.com\\>" "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 "@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.