From: yamaoka <yamaoka>
Date: Wed, 23 Jul 2003 22:19:21 +0000 (+0000)
Subject: Synch to Gnus 200307232026.
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=03cb1524fb82944a3be975c74111075308ecfd24;p=elisp%2Fgnus.git-

Synch to Gnus 200307232026.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a49fae4..634e382 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,17 @@
+2003-07-23  Teodor Zlatanov  <tzz@lifelogs.com>
+
+	* gnus.el (gnus-install-group-spam-parameters): add the
+	gnus-ticked-mark to the possible choices of ham marks
+
+	* spam.el (spam-process-ham-in-nonham-groups): new variable
+	(spam-summary-prepare-exit): use spam-process-ham-in-nonham-groups
+
+2003-07-23  Jesper Harder  <harder@ifa.au.dk>
+
+	* rfc2047.el (rfc2047-header-encoding-alist): Add Mail-Followup-To
+	and Mail-Copies-To to address-mime.
+	(rfc2047-narrow-to-field): Use rfc2047-point-at-bol.
+
 2003-07-19  Jesper Harder  <harder@ifa.au.dk>
 
 	* mm-util.el (mm-coding-system-priorities): Docstring improvement.
diff --git a/lisp/gnus.el b/lisp/gnus.el
index 9ae59fe..75bfcb3 100644
--- a/lisp/gnus.el
+++ b/lisp/gnus.el
@@ -2024,6 +2024,7 @@ mail groups, and only works in spam groups."
 			  (set
 			   (variable-item gnus-del-mark)
 			   (variable-item gnus-read-mark)
+			   (variable-item gnus-ticked-mark)
 			   (variable-item gnus-killed-mark)
 			   (variable-item gnus-kill-file-mark)
 			   (variable-item gnus-low-score-mark)))
diff --git a/lisp/rfc2047.el b/lisp/rfc2047.el
index 8e3523e..bf4328d 100644
--- a/lisp/rfc2047.el
+++ b/lisp/rfc2047.el
@@ -71,8 +71,8 @@ Value is what BODY returns."
   '(("Newsgroups" . nil)
     ("Followup-To" . nil)
     ("Message-ID" . nil)
-    ("\\(Resent-\\)?\\(From\\|Cc\\|To\\|Bcc\\|Reply-To\\|Sender\\)" .
-     address-mime)
+    ("\\(Resent-\\)?\\(From\\|Cc\\|To\\|Bcc\\|Reply-To\\|Sender\
+\\|Mail-Followup-To\\|Mail-Copies-To\\)" . address-mime)
     (t . mime))
   "*Header/encoding method alist.
 The list is traversed sequentially.  The keys can either be
@@ -133,9 +133,7 @@ quoted-printable and base64 respectively.")
    (progn
      (forward-line 1)
      (if (re-search-forward "^[^ \n\t]" nil t)
-	 (progn
-	   (beginning-of-line)
-	   (point))
+	 (rfc2047-point-at-bol)
        (point-max))))
   (goto-char (point-min)))
 
diff --git a/lisp/spam.el b/lisp/spam.el
index 895ac5c..45c2e66 100644
--- a/lisp/spam.el
+++ b/lisp/spam.el
@@ -77,6 +77,11 @@ spam groups."
   :type 'boolean
   :group 'spam)
 
+(defcustom spam-process-ham-in-nonham-groups nil
+  "Whether ham should be processed in non-ham groups."
+  :type 'boolean
+  :group 'spam)
+
 (defcustom spam-mark-only-unseen-as-spam t
   "Whether only unseen articles should be marked as spam in spam
 groups.  When nil, all unread articles in a spam group are marked as
@@ -209,6 +214,7 @@ the spam-use-* variables is set."
   :type 'string
   :group 'spam)
 
+;;; TODO: deprecate this variable, it's confusing since it's a list of strings, not regular expressions
 (defcustom spam-junk-mailgroups (cons spam-split-group '("mail.junk" "poste.pourriel"))
   "Mailgroups with spam contents.
 All unmarked article in such group receive the spam mark on group entry."
@@ -475,7 +481,8 @@ spamoracle database."
     (gnus-message 5 "Marking spam as expired without moving it")
     (spam-mark-spam-as-expired-and-move-routine nil)
 
-    (when (spam-group-ham-contents-p gnus-newsgroup-name)
+    (when (or (spam-group-ham-contents-p gnus-newsgroup-name)
+	      spam-process-ham-in-nonham-groups)
       (when (spam-group-ham-processor-whitelist-p gnus-newsgroup-name)
 	(gnus-message 5 "Registering ham with the whitelist")
 	(spam-whitelist-register-routine))