Synch to Oort Gnus.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 35d8dbf..8fcd2bb 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2003-03-08  Teodor Zlatanov  <tzz@lifelogs.com>
+
+       * spam.el (spam-ham-move-routine): use
+       spam-mark-ham-unread-before-move-from-spam-group
+       (spam-mark-ham-unread-before-move-from-spam-group): new variable
+
 2003-03-07  Teodor Zlatanov  <tzz@lifelogs.com>
 
        * spam.el: load nnimap.el when compiling

diff --git a/lisp/spam.el b/lisp/spam.el
index 9b2f0ac..dc44be1 100644 (file)
--- a/lisp/spam.el
+++ b/lisp/spam.el
@@ -69,7 +69,15 @@ When nil, only ham and unclassified groups will have their spam moved
 to the spam-process-destination.  When t, spam will also be moved from
 spam groups."
   :type 'boolean
-  :group 'spam-ifile)
+  :group 'spam)
+
+(defcustom spam-mark-ham-unread-before-move-from-spam-group nil
+  "Whether ham should be marked unread before it's moved out of a spam
+group according to ham-process-destination.  This variable is an
+official entry in the international Longest Variable Name
+Competition."
+  :type 'boolean
+  :group 'spam)
 
 (defcustom spam-whitelist (expand-file-name "whitelist" spam-directory)
   "The location of the whitelist.
@@ -470,6 +478,8 @@ your main source of newsgroup names."
       ;; now do the actual move
       (when tomove
        (dolist (article tomove)
+         (when spam-mark-ham-unread-before-move-from-spam-group
+           (gnus-summary-mark-article article gnus-unread-mark))           
          (gnus-summary-set-process-mark article))
        (if copy
            (gnus-summary-copy-article nil group)