Synch with Oort Gnus.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 7f7e023..50ac925 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,21 @@
+2003-01-21  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+       * message.el (message-required-headers): Doc fix.
+
+2003-01-21  Teodor Zlatanov  <tzz@lifelogs.com>
+
+       * spam.el (spam-group-ham-processor-bogofilter-p): fixed bug
+       (spam-ifile-register-ham-routine, spam-ifile-ham-category): new
+       option to make ifile a purely binary classifier
+
+2003-01-21  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+       * mml-sec.el (mml-secure-sign-pgpauto): Renamed.
+       (mml-secure-encrypt-pgpmime): Removed double.
+
+       * gnus-sum.el (gnus-summary-mark-article-as-replied): Added
+       debugging statements.
+
 2003-01-21  Andreas Fuchs  <asf@void.at>
 
        * mml-sec.el (mml-sign-alist): Added pgpauto.

diff --git a/lisp/gnus-sum.el b/lisp/gnus-sum.el
index f7eafe9..a78e30c 100644 (file)
--- a/lisp/gnus-sum.el
+++ b/lisp/gnus-sum.el
@@ -9531,6 +9531,8 @@ ARTICLE can also be a list of articles."
   (interactive (list (gnus-summary-article-number)))
   (let ((articles (if (listp article) article (list article))))
     (dolist (article articles)
+      (unless (numberp article)
+       (error "%s is not a number" article))
       (push article gnus-newsgroup-replied)
       (let ((buffer-read-only nil))
        (when (gnus-summary-goto-subject article nil t)

diff --git a/lisp/message.el b/lisp/message.el
index 05a3ccc..c817653 100644 (file)
--- a/lisp/message.el
+++ b/lisp/message.el
@@ -347,9 +347,9 @@ Checks include `subject-cmsg', `multiple-headers', `sendsys',
   :type '(repeat sexp))                        ; Fixme: improve this
 
 (defcustom message-required-headers '((optional . References) From)
-  "*Headers to be generated or promted for when sending a message.
+  "*Headers to be generated or prompted for when sending a message.
 Also see `message-required-news-headers' and
-1message-required-mail-headers'."
+`message-required-mail-headers'."
   :group 'message-news
   :group 'message-headers
   :type '(repeat sexp))

diff --git a/lisp/mml-sec.el b/lisp/mml-sec.el
index 8583604..0b1be32 100644 (file)
--- a/lisp/mml-sec.el
+++ b/lisp/mml-sec.el
@@ -165,7 +165,7 @@ You can also customize or set `mml-signencrypt-style-alist' instead."
   (interactive)
   (mml-secure-part "pgp" 'sign))
 
-(defun mml-secure-sign-pgp ()
+(defun mml-secure-sign-pgpauto ()
   "Add MML tags to PGP-auto sign this MML part."
   (interactive)
   (mml-secure-part "pgpauto" 'sign))
@@ -259,7 +259,7 @@ If called with a prefix argument, only encrypt (do NOT sign)."
   (interactive "P")
   (mml-secure-message "pgpmime" (if dontsign 'encrypt 'signencrypt)))
 
-(defun mml-secure-message-encrypt-pgpmime (&optional dontsign)
+(defun mml-secure-message-encrypt-pgpauto (&optional dontsign)
   "Add MML tag to encrypt and sign the entire message.
 If called with a prefix argument, only encrypt (do NOT sign)."
   (interactive "P")

diff --git a/lisp/nntp.el b/lisp/nntp.el
index fb329d8..fe5f9e0 100644 (file)
--- a/lisp/nntp.el
+++ b/lisp/nntp.el
@@ -764,7 +764,8 @@ command whose response triggered the error."
                            (set-buffer buf)
                            (goto-char (point-max))
                            (if (not nntp-server-list-active-group)
-                               (not (re-search-backward "\r?\n" (- (point) 3) t))
+                               (not (re-search-backward "\r?\n"
+                                                       (- (point) 3) t))
                              (not (re-search-backward "^\\.\r?\n"
                                                       (- (point) 4) t)))))
                (nntp-accept-response)))
@@ -1503,12 +1504,13 @@ password contained in '~/.nntp-authinfo'."
                     (while (re-search-forward "^[0-9][0-9][0-9] .*\n" nil t)
                       (incf received))
                     (setq last-point (point))
-                    (or (< received count) ;; I haven't started reading the final response
+                    (or (< received count)
+                        ;; I haven't started reading the final response
                          (progn
                            (goto-char (point-max))
                            (forward-line -1)
-                           (not (looking-at "^\\.\r?\n"))) ;; I haven't read the end of the final response
-                         ))
+                           (not (looking-at "^\\.\r?\n")))))
+             ;; I haven't read the end of the final response
              (nntp-accept-response)
              (set-buffer process-buffer))))
 
@@ -1526,8 +1528,9 @@ password contained in '~/.nntp-authinfo'."
         (when (<= count 1)
           (goto-char (point-min))
           (when (re-search-forward "^[0-9][0-9][0-9] .*\n\\([0-9]+\\)" nil t)
-            (let ((low-limit (string-to-int (buffer-substring (match-beginning 1) 
-                                                              (match-end 1)))))
+            (let ((low-limit (string-to-int
+                             (buffer-substring (match-beginning 1) 
+                                               (match-end 1)))))
               (while (and articles (<= (car articles) low-limit))
                 (setq articles (cdr articles))))))
         (set-buffer buf))

diff --git a/lisp/spam.el b/lisp/spam.el
index 493b26e..40b750c 100644 (file)
--- a/lisp/spam.el
+++ b/lisp/spam.el
@@ -195,6 +195,13 @@ Such articles will be transmitted to `bogofilter -s' on group exit."
   :type 'string
   :group 'spam-ifile)
 
+(defcustom spam-ifile-ham-category nil
+  "Name of the ham ifile category.  If nil, the current group name will
+be used."
+  :type '(choice (string :tag "Use a fixed category")
+                (const :tag "Use the current group name"))
+  :group 'spam-ifile)
+
 (defcustom spam-ifile-all-categories nil
   "Whether the ifile check will return all categories, or just spam.
 Set this to t if you want to use the spam-split invocation of ifile as
@@ -272,7 +279,7 @@ your main source of newsgroup names."
   (spam-group-processor-p group 'gnus-group-ham-exit-processor-ifile))
 
 (defun spam-group-ham-processor-bogofilter-p (group)
-  (spam-group-processor-p group 'gnus-group-ham-exit-processor-ifile))
+  (spam-group-processor-p group 'gnus-group-ham-exit-processor-bogofilter))
 
 (defun spam-group-spam-processor-stat-p (group)
   (spam-group-processor-p group 'gnus-group-spam-exit-processor-stat))
@@ -641,7 +648,7 @@ Uses `gnus-newsgroup-name' if category is nil (for ham registration)."
    nil
    (lambda (article)
      (spam-ifile-register-with-ifile 
-      (spam-get-article-as-string article) nil))))
+      (spam-get-article-as-string article) spam-ifile-ham-category))))
 
 \f
 ;;;; spam-stat