--- a/mail-from-inf.el	Sat Dec 16 21:08:13 2023 +0000
+++ b/mail-from-inf.el	Sat Dec 16 21:10:30 2023 +0000
@@ -1,26 +1,50 @@
 (setq my-mail-dir "/disk/scratch/mail"
       gnus-your-organization "HCRC, University of Edinburgh"
-      gnus-default-directory "/afs/inf.ed.ac.uk/user/h/ht"
+      gnus-home-directory "/disk/scratch/gnus"
+      gnus-default-directory "/disk/scratch"
       nnmail-message-id-cache-file "/disk/scratch/gnus/.nnmail-cache"
       mail-sources
       '((file :path "/disk/scratch/mail/ht_mbox"))
       mail-source-crash-box "/tmp/crashbox" ; local disk
       nndraft-directory "/disk/scratch/drafts/"
       message-auto-save-directory "/disk/scratch/drafts/"
+      mail-archive-file-name (concat "/disk/scratch/mail/cpy/general/"
+						  (format-time-string
+						   "%Y-%m" (current-time))
+						  ".mbox")
 )
 
+(setq rmail-dont-reply-to-names "hthompso*\\|h\\.thompso*\\|ht@*" )
+
+(setq rmail-show-mime nil)
+(set-default 'ht-last-file (expand-file-name "/disk/scratch/mail/"))
+(setq ht-diary-file-name "/disk/scratch/mail/diary.babyl")
+(setq user-mail-address "ht@inf.ed.ac.uk")
+(setq mail-append-host "inf.ed.ac.uk")
+(setq mail-host-address "inf.ed.ac.uk")
+(setq rmail-spool-directory (file-name-as-directory
+			     (concat rmail-spool-directory
+				     "ht-mail")))
+;; don't know why this is necessary
+(setq rmail-primary-inbox-list
+      (list (concat rmail-spool-directory "ht")))
+
 (setq white-subjects "\\b\\(phd\\|ilcc\\)\\b")
 
+(setq white-domains (list))
+
+(setq ad-domains (list "planetx.co.uk"))
+
 (setq w3c-lists1
-      '((list "w3c-xml-schema-\\([a-zA-Z]+\\)\\(\\.w3\\.org\\)?" "xml-schema-\\1")
-	(list "chairs\\(\\.w3\\.org\\)?" "w3c-chairs" )
+      '((any "w3c-xml-schema-\\([a-zA-Z]+\\)\\(@\\.w3\\.org\\)?" "xml-schema-\\1")
+	(any "chairs\\(@\\.w3\\.org\\)?" "w3c-chairs" )
 	(to "\\(w3c\\|public\\|member\\)-xml-\\([-a-zA-Z]+\\)\\(\\.w3\\.org\\)?"
 	    "xml-\\2" )
 	;(list "w3t-\\([-a-zA-Z]+\\)\\(\\.w3\\.org\\)?" "w3t-\\1")
 	;(list "team-\\([-a-zA-Z]+\\)\\(\\.w3\\.org\\)?" "w3-team-\\1")
 	;(list "w3c-\\(xsl-wg\\|format\\|i18n-ig\\)\\(\\.w3\\.org\\)?" "w3c-xsl")
-	(list "w3c-\\([-a-zA-Z]+\\)\\(\\.w3\\.org\\)?" "w3c-\\1")
-	(list "member-\\(ac-uk\\|access\\)" "w3-member-\\1");[-a-zA-Z]+\\)
+	(any "w3c-\\([-a-zA-Z]+\\)\\(@\\.w3\\.org\\)?" "w3c-\\1")
+	(any "member-\\(ac-uk\\|access\\)" "w3-member-\\1");[-a-zA-Z]+\\)
 	(to "public-xpointer-registry\\(-request\\)?"
 	    "xpointer-registry");[-a-zA-Z]+
 	(to "public-\\([-a-zA-Z]+\\)" "w3-public-\\1")
@@ -56,8 +80,8 @@
 	))
 
 (setq xml-lists2
-      '((list "ietf-xml-mime\\.imc\\.org" "xml-mime")
-	(list "xml-mime\\.ietf\\.org" "xml-mime")))
+      '((any "ietf-xml-mime\\.imc\\.org" "xml-mime")
+	(any "xml-mime\\.ietf\\.org" "xml-mime")))
 
 (setq misc-list1
       '(;(from "w3t-\\([a-zA-Z]+\\)-request" "w3t-\\1")
@@ -157,7 +181,7 @@
 	;(to "squid-users@lists.squid-cache.org\\|squid-users@squid-cache.org"
 	;    "squid")
 	(to "exist-open" "exist")
-	(list "ilcc-\\([a-zA-Z]+\\)" "ilcc-\\1")
+	(any "ilcc-\\([a-zA-Z]+\\)" "ilcc-\\1")
 	(to "ilcc" "ilcc")
 	(to ".*lecturers@inf.ed.ac.uk" "inf-teach")
 	(to "\\(aisyllabus\\|acstaff\\)" "inf-teach")
@@ -170,6 +194,9 @@
 
 (defconst ht-spam-res '("bfSPAM" "boSPAM" "edSPAM" "saSPAM" "slSPAM"))
 
+(defun log-good-sender (sres)
+  (message "good sender %s with result %s" (get-from-gnus-addr) sres))
+
 (setq nnmail-split-fancy
       '(|
 	(to "ht\\+d@inf\\.ed\\.ac\\.uk" "_diary")
@@ -269,3 +296,5 @@
     (gnus-summary-exit)
     )
   )
+
+(provide 'mail-from-inf)