# HG changeset patch
# User Henry S Thompson <ht@inf.ed.ac.uk>
# Date 1703095585 0
# Node ID 67c04dbeb162194fc953b08417da837d54f8f138
# Parent  06ccca1d4756a66a82e3dd9ef877de61aa81d51c# Parent  40e245d3d1b3be883411f1feb066e5089fa442f5
merge

diff -r 40e245d3d1b3 -r 67c04dbeb162 gnus-init.el
--- a/gnus-init.el	Wed Dec 20 18:00:34 2023 +0000
+++ b/gnus-init.el	Wed Dec 20 18:06:25 2023 +0000
@@ -12,15 +12,17 @@
 (set-ht-compiled-split)
 
 (setq
- gnus-article-save-directory (expand-file-name (concat my-mail-dir "/Mail"))
+ gnus-article-save-directory (expand-file-name
+			      (concat my-mail-dir "/Mail"))
  nnml-directory (expand-file-name (concat my-mail-dir "/Mail"))
  gnus-message-archive-method
  '(nnfolder "archive"
    ;; the following two are not taking effect, not sure why, answer
    ;; _may_ lie in gnus-setup-news...
    (nnfolder-directory (concat my-mail-dir "/cpy"))
-   (nnfolder-active-file (concat my-mail-dir "/cpy/active")))
- )
+   (nnfolder-active-file (concat my-mail-dir "/cpy/active"))
+   )
+)
 
 (setq gnus-novice-user nil)
 
diff -r 40e245d3d1b3 -r 67c04dbeb162 mail-from-m.el
--- a/mail-from-m.el	Wed Dec 20 18:00:34 2023 +0000
+++ b/mail-from-m.el	Wed Dec 20 18:06:25 2023 +0000
@@ -11,14 +11,17 @@
 (defun system-name () "home.hst.name")
 
 (setq gnus-default-directory "/home/ht"
+      gnus-home-directory "/home/ht"
       my-mail-dir "/home/ht/mail"
       mail-sources '((file :path "/var/spool/mail/ht"))
+      mail-archive-file-name (concat my-mail-dir "/cpy/general/"
+				     (format-time-string
+				      "%Y-%m" (current-time))
+				     ".mbox")
 )
 
 (setq mail-archive-file-name (expand-file-name "~/mail/cpy/general"))
 
-
-
 (defun set-nnmail-split-fancy ()
   (setq nnmail-split-fancy
       (let ((month (format-time-string "%Y-%m" (current-time))))