dot/gnus.el, ...: Move general configuration into the common file.

This way, everyone benefits.

diff --git a/dot/gnus-local.el.distorted b/dot/gnus-local.el.distorted
index 50b7159..94c8c32 100644 (file)
--- a/dot/gnus-local.el.distorted
+++ b/dot/gnus-local.el.distorted
@@ -5,17 +5,8 @@
 ;;; (c) 2014 Mark Wooding
 ;;;
 
-;;;--------------------------------------------------------------------------
-;;; Random configuration.
-
 (setq auth-sources '("~/.gnus.authinfo"))
 
-(remove-hook 'gnus-mark-article-hook
-            'gnus-summary-mark-read-and-unread-as-read)
-(add-hook 'gnus-mark-article-hook 'gnus-summary-mark-unread-as-read)
-
-(setq gnus-level-unsubscribed 6)
-
 ;;;--------------------------------------------------------------------------
 ;;; How to send mail.
 

diff --git a/dot/gnus.el b/dot/gnus.el
index 6c6f4c5..1625542 100644 (file)
--- a/dot/gnus.el
+++ b/dot/gnus.el
@@ -105,6 +105,18 @@
                            " ")))
 (add-hook 'gnus-article-mode-hook #'mdw-gnus-article-setup)
 
+;; Don't expire articles on selection if they're alread read.  This provides
+;; a handy way to prevent expiry, and actually forcing expiry isn't
+;; significantly harder.
+(remove-hook 'gnus-mark-article-hook
+            'gnus-summary-mark-read-and-unread-as-read)
+(add-hook 'gnus-mark-article-hook 'gnus-summary-mark-unread-as-read)
+
+;; Leave an oubliette level 7 for broken things which look like mailboxes.
+;; Otherwise Gnus keeps on resurrecting them and later realising that they're
+;; bogus.
+(setq gnus-level-unsubscribed 6)
+
 ;;;--------------------------------------------------------------------------
 ;;; Magic for sending mail the correct way.