dot/gnus-local.el.distorted: Refactor the posting-style for `crap.*'.

[profile] / dot / gnus-local.el.distorted

diff --git a/dot/gnus-local.el.distorted b/dot/gnus-local.el.distorted
index 835d180..e7e7f52 100644 (file)
--- a/dot/gnus-local.el.distorted
+++ b/dot/gnus-local.el.distorted
@@ -72,18 +72,7 @@
 (setq message-alternative-emails bbdb-user-mail-names
       message-dont-reply-to-names message-alternative-emails)
 
-;; Mail sent to `mdw-nospam-THING' should appear to come from this address.
-(setq gnus-posting-styles
-      '(("^nnimap\\+distorted:crap\\."
-        (address (concat "mdw-nospam-"
-                         (substring gnus-newsgroup-name (match-end 0))
-                         "@distorted.org.uk")))
-       ("^nnimap\\+[^:]+-chiark:"
-        ("X-mdw-Send-Mail" "chiark-smtp"))
-       ("^nnimap\\+google:"
-        (address "distorted.mdw@gmail.com")
-        ("X-mdw-Send-Mail" "gmail-smtp"))))
-
+;; Augment Gnus's built-in header-list abbreviations.
 (require 'nnmail)
 (setq nnmail-split-abbrev-alist
       (mdw-uniquify-alist
@@ -94,6 +83,7 @@
                         "resent-to\\|resent-cc"))
         ,@nnmail-split-abbrev-alist)))
 
+;; Find out about my `odin.gg' mappings.
 (defvar mdw-odin-parse-regexp
   (concat "^"
          "\\S-+" "\\s-+"               ; time limit
@@ -102,8 +92,10 @@
          "=" "\\(" "\\S-+" "\\)"       ; mailbox tag
          "\\(" "$" "\\|" "\\s-" "\\)"))
 
-(defun mdw-odin-splits ()
-  (let ((list nil))
+(defvar mdw-odin-splits nil)
+
+(defun mdw-update-odin-info ()
+  (let ((splits nil))
     (with-temp-buffer
       (call-process "ssh" nil t nil
                    "stratocaster" "userv" "odin" "mail" "list")
@@ -114,9 +106,23 @@
                (tag (match-string 2)))
            (push `(to ,(format "%s@odin\\.gg" local-part)
                       ,(format "crap.%s" tag))
-                 list)))
+                 splits)))
        (forward-line)))
-    (nreverse list)))
+    (setq mdw-odin-splits (nreverse splits))))
+(mdw-update-odin-info)
+
+;; Mail sent to `mdw-nospam-THING' should appear to come from this address.
+(setq gnus-posting-styles
+      '(("^nnimap\\+distorted:crap\\."
+        (address (let* ((mailbox (substring gnus-newsgroup-name
+                                            (match-end 0)))
+                        (entry (assoc mailbox mdw-odin-sender-alist)))
+                   (concat "mdw-nospam-" mailbox "@distorted.org.uk"))))
+       ("^nnimap\\+[^:]+-chiark:"
+        ("X-mdw-Send-Mail" "chiark-smtp"))
+       ("^nnimap\\+google:"
+        (address "distorted.mdw@gmail.com")
+        ("X-mdw-Send-Mail" "gmail-smtp"))))
 
 ;; The actual splitting rules.
 (setq nnmail-split-fancy
@@ -166,7 +172,7 @@
          (to "\\<mdw-nopspam-\\([^@]+\\)@" "crap.\\1" t)
 
          (to "\\(markw\\|mdw\\|mw\\)@odin\\.gg" "mail.misc")
-         ,@(mdw-odin-splits)
+         ,@mdw-odin-splits
          (to "\\([a-z0-9]+\\)@odin\\.gg" "crap.odin-misc")
 
          ;; Regular nags.