dot/gnus-local.el.distorted: Be more careful about word boundaries.

I've found a number of things being sorted into the wrong folder as a
result of this.

diff --git a/dot/gnus-local.el.distorted b/dot/gnus-local.el.distorted
index 74039bc267ae6de9a396a11e1b480e9548ede80a..ab855f23de922e500b07ecc5dfb107094d71f428 100644 (file)
--- a/dot/gnus-local.el.distorted
+++ b/dot/gnus-local.el.distorted
@@ -97,15 +97,15 @@
 (setq nnmail-split-fancy
       '(|
          ;; Administrative boxes.
-         (to "\\(root\\|postgres\\|ca\\|noc\\)@" "admin.misc" t)
-         (to "\\(jukebox\\|nobody\\|darchive\\)@" "admin.misc" t)
-         (to "\\(hostmaster\\)@" "admin.dns" t)
-         (to "\\(news\\|newsmaster\\|usenet\\)@" "admin.news" t)
-         (to "\\(postmaster\\|spamd\\|mailer-daemon\\)@" "admin.mail" t)
-         (to "\\(irc\\|blight\\|ircbot\\)@" "admin.irc" t)
-         (to "\\(www\\|webmaster\\|mtos\\)@" "admin.web" t)
-         (to "\\(ftp\\|ftpadmin\\|mirror\\)@" "admin.ftp" t)
-         (to "\\(abuse\\|security\\)@" "admin.keep" t)
+         (to "\\<\\(root\\|postgres\\|ca\\|noc\\)@" "admin.misc" t)
+         (to "\\<\\(jukebox\\|nobody\\|darchive\\)@" "admin.misc" t)
+         (to "\\<\\(hostmaster\\)@" "admin.dns" t)
+         (to "\\<\\(news\\|newsmaster\\|usenet\\)@" "admin.news" t)
+         (to "\\<\\(postmaster\\|spamd\\|mailer-daemon\\)@" "admin.mail" t)
+         (to "\\<\\(irc\\|blight\\|ircbot\\)@" "admin.irc" t)
+         (to "\\<\\(www\\|webmaster\\|mtos\\)@" "admin.web" t)
+         (to "\\<\\(ftp\\|ftpadmin\\|mirror\\)@" "admin.ftp" t)
+         (to "\\\<\\(abuse\\|security\\)@" "admin.keep" t)
          (from "cron daemon" "admin.misc")
          (from "uucp@distorted\\.org\\.uk" "admin.uucp")
          (from "darchive@.*\\.distorted\\.org\\.uk" "admin.misc")
@@ -120,32 +120,32 @@
          (to "jump-announce@jump\\.net\\.uk" "lists.jump-announce")
 
          ;; Per-sender addresses.
-         (to "mdw-nospam-justgviing@" "crap.justgiving" t)
-         (to "mdw-nospam-\\([^@]+\\)@" "crap.\\1" t)
-         (to "mdw-nopspam-\\([^@]+\\)@" "crap.\\1" t)
+         (to "\\<mdw-nospam-justgviing@" "crap.justgiving" t)
+         (to "\\<mdw-nospam-\\([^@]+\\)@" "crap.\\1" t)
+         (to "\\<mdw-nopspam-\\([^@]+\\)@" "crap.\\1" t)
 
          ;; Regular nags.
          (from "\\(sealbot\\|cardbot\\)@ncipher\\.com" "nag.cardbot")
          (from "\\<mailman-owner@" "nag.mailman" t)
 
          ;; Uninteresting mail.
-         (from "expiry@letsencrypt\\.org" "spam.letsencrypt" t)
+         (from "expiry@letsencrypt\\.org" "spam.letsencrypt")
 
          ;; Other splits I've not given a per-sender address.
-         (from "@\\(.*\\.\\)?lovefilm\\.com" "spam.lovefilm" t)
+         (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 "campaigns@jolla\\.com" "crap.jolla" 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 "campaigns@jolla\\.com\\>" "crap.jolla" t)
 
          ;; Default.
          "mail.misc")