dot/profile: Unbungle the setting of `$DEB_BUILD_OPTIONS'.

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

diff --git a/dot/gnus-local.el.distorted b/dot/gnus-local.el.distorted
index d25a9ba..7bfba60 100644 (file)
--- a/dot/gnus-local.el.distorted
+++ b/dot/gnus-local.el.distorted
@@ -93,9 +93,10 @@
          "\\(" "$" "\\|" "\\s-" "\\)"))
 
 (defvar mdw-odin-splits nil)
+(defvar mdw-odin-sender-alist nil)
 
 (defun mdw-update-odin-info ()
-  (let ((splits nil))
+  (let ((splits nil) (senders nil))
     (with-temp-buffer
       (call-process "ssh" nil t nil
                    "stratocaster" "userv" "odin" "mail" "list")
@@ -106,17 +107,21 @@
                (tag (match-string 2)))
            (push `(to ,(format "%s@odin\\.gg" local-part)
                       ,(format "crap.%s" tag))
-                 splits)))
+                 splits)
+           (push (cons tag local-part) senders)))
        (forward-line)))
-    (setq mdw-odin-splits (nreverse splits))))
+    (setq mdw-odin-splits (nreverse splits)
+         mdw-odin-sender-alist (nreverse senders))))
 (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 (concat "mdw-nospam-"
-                         (substring gnus-newsgroup-name (match-end 0))
-                         "@distorted.org.uk")))
+        (address (let* ((mailbox (substring gnus-newsgroup-name
+                                            (match-end 0)))
+                        (entry (assoc mailbox mdw-odin-sender-alist)))
+                   (if entry (concat (cdr entry) "@odin.gg")
+                     (concat "mdw-nospam-" mailbox "@distorted.org.uk")))))
        ("^nnimap\\+[^:]+-chiark:"
         ("X-mdw-Send-Mail" "chiark-smtp"))
        ("^nnimap\\+google:"