From 434ce6f4f67b6ed613950e0919c065f617ced887 Mon Sep 17 00:00:00 2001
From: yamaoka <yamaoka>
Date: Thu, 19 Jun 2003 22:57:29 +0000
Subject: [PATCH] Synch to Gnus 200306192244.

---
 lisp/ChangeLog   |   16 ++++++++++++++++
 lisp/gnus-art.el |    2 +-
 lisp/spam.el     |   13 +++++++------
 3 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c26100a..9820616 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,19 @@
+2003-06-19  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+	* gnus-art.el: Comment fix.
+
+2003-06-20  Jesper Harder  <harder@ifa.au.dk>
+
+	* gnus-msg.el (gnus-configure-posting-styles): Remove unused
+	variable.  From Jan Rychter <jan@rychter.com>.
+
+	* spam.el (spam-spamoracle-learn): insert-string is obsolete.
+
+2003-06-19  Teodor Zlatanov  <tzz@lifelogs.com>
+
+	* spam.el (spam-enter-list): do not enter duplicate addresses into
+	the whitelist/blacklist
+
 2003-06-19  Jesper Harder  <harder@ifa.au.dk>
 
 	* nnheader.el (nnheader-init-server-buffer): Add
diff --git a/lisp/gnus-art.el b/lisp/gnus-art.el
index 8cbf824..085e6fa 100644
--- a/lisp/gnus-art.el
+++ b/lisp/gnus-art.el
@@ -253,7 +253,7 @@ regexp.  If it matches, the text in question is not a signature."
   :type 'sexp
   :group 'gnus-article-hiding)
 
-;; Fixme: This isn't the right thing for mixed graphical and and
+;; Fixme: This isn't the right thing for mixed graphical and
 ;; non-graphical frames in a session.
 (defcustom gnus-article-x-face-command
   (cond
diff --git a/lisp/spam.el b/lisp/spam.el
index 70726fe..4426350 100644
--- a/lisp/spam.el
+++ b/lisp/spam.el
@@ -962,11 +962,12 @@ Uses `gnus-newsgroup-name' if category is nil (for ham registration)."
   (save-excursion
     (set-buffer
      (find-file-noselect file))
-    (goto-char (point-max))
-    (unless (bobp)
-      (insert "\n"))
-    (insert address "\n")
-    (save-buffer)))
+    (unless (search-forward (regexp-quote address))
+      (goto-char (point-max))
+      (unless (bobp)
+	(insert "\n"))
+      (insert address "\n")
+      (save-buffer))))
 
 ;;; returns t if the sender is in the whitelist, nil or spam-split-group otherwise
 (defun spam-check-whitelist ()
@@ -1140,7 +1141,7 @@ Uses `gnus-newsgroup-name' if category is nil (for ham registration)."
     (let ((temp-buffer-name (buffer-name)))
       (save-excursion
 	(goto-char (point-min))
-	(insert-string (spam-get-article-as-string article))
+	(insert (spam-get-article-as-string article))
 	(let* ((arg (if article-is-spam-p "-spam" "-good"))
 	       (status 
 		(apply 'call-process-region
-- 
1.7.10.4