From: yamaoka <yamaoka>
Date: Fri, 20 Jun 2003 02:15:17 +0000 (+0000)
Subject: Synch to Gnus 200306200213.
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7a3a7abe75a6648adc53b3f9eebe59ca9ebc2b5a;p=elisp%2Fgnus.git-

Synch to Gnus 200306200213.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 9820616..77b377d 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,11 @@
+2003-06-20  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* message.el (sender, from): No need to bind them.
+
+2003-06-19  Teodor Zlatanov  <tzz@lifelogs.com>
+
+	* spam.el (spam-enter-list): search-forward specified wrong
+
 2003-06-19  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
 	* gnus-art.el: Comment fix.
diff --git a/lisp/message.el b/lisp/message.el
index 7e96a03..c71d844 100644
--- a/lisp/message.el
+++ b/lisp/message.el
@@ -6452,11 +6452,6 @@ that further discussion should take place only in "
        ,@(and distribution (list (cons 'Distribution distribution))))
      cur)))
 
-(eval-when-compile
-  ;; Must be dynamically bound for message-is-yours-p.
-  (defvar sender)
-  (defvar from))
-
 (defun message-is-yours-p ()
   "Non-nil means current article is yours.
 If you have added 'cancel-messages to 'message-shoot-gnksa-feet', all articles
diff --git a/lisp/spam.el b/lisp/spam.el
index 4426350..32fcaf6 100644
--- a/lisp/spam.el
+++ b/lisp/spam.el
@@ -962,7 +962,8 @@ Uses `gnus-newsgroup-name' if category is nil (for ham registration)."
   (save-excursion
     (set-buffer
      (find-file-noselect file))
-    (unless (search-forward (regexp-quote address))
+    (goto-char (point-min))
+    (unless (re-search-forward (regexp-quote address) nil t)
       (goto-char (point-max))
       (unless (bobp)
 	(insert "\n"))