From: yamaoka <yamaoka>
Date: Thu, 20 Feb 2003 00:36:07 +0000 (+0000)
Subject: Synch to Oort Gnus.
X-Git-Tag: t-gnus-6_15_17-00-quimby~55
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=85c8e6bc9f1451bec73160cfe4ed27d7300ddab2;p=elisp%2Fgnus.git-

Synch to Oort Gnus.
---

diff --git a/ChangeLog b/ChangeLog
index 50029be..ca3fb3b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2003-02-20  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* lisp/gnus-offline.el (gnus-offline-add-custom-header): Use
+	insert instead of insert-string which is obsolete in Emacs 21.4
+	(synch to the change of Jesper Harder at 2003-02-20).
+
 2003-02-19  Reiner Steib  <Reiner.Steib@gmx.de>
 
 	* GNUS-NEWS: Renamed `gnus-unsightly-citation-regexp' to
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a7dced1..f9ecae3 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,15 @@
 2003-02-20  Jesper Harder  <harder@ifa.au.dk>
 
+	* gnus-spec.el (gnus-xmas-format): Use insert instead of
+	insert-string which is obsolete in Emacs 21.4.
+
+	* message.el (message-cross-post-followup-to-header): do.
+	
+	* spam.el (spam-ifile-register-with-ifile)
+	(spam-stat-register-spam-routine)
+	(spam-stat-register-ham-routine)
+	(spam-bogofilter-register-with-bogofilter): do.
+
 	* mailcap.el (mailcap-mime-data): Fix typo.
 
 	* gnus-topic.el (gnus-topic-make-menu-bar): Add ellipsis.
diff --git a/lisp/gnus-offline.el b/lisp/gnus-offline.el
index a30b47d..79eaa10 100644
--- a/lisp/gnus-offline.el
+++ b/lisp/gnus-offline.el
@@ -607,7 +607,7 @@ Please check your .emacs or .gnus.el to work nnspool fine.")
       (setq hdr (concat header " "))
       (setq str (concat hdr string))
       (setq hdr (concat str "\n"))
-      (insert-string hdr))))
+      (insert hdr))))
 ;;
 ;; Add X-Offline-Backend header.
 ;;
diff --git a/lisp/gnus-spec.el b/lisp/gnus-spec.el
index dbd4ac5..a45f1ca 100644
--- a/lisp/gnus-spec.el
+++ b/lisp/gnus-spec.el
@@ -525,7 +525,7 @@ are supported for %s."
   (let ((re "%%\\|%\\(-\\)?\\([1-9][0-9]*\\)?s")
 	(n (length args)))
     (with-temp-buffer
-      (insert-string fstring)
+      (insert fstring)
       (goto-char (point-min))
       (while (re-search-forward re nil t)
 	(goto-char (match-end 0))
diff --git a/lisp/message.el b/lisp/message.el
index 7f43ebb..06ee36f 100644
--- a/lisp/message.el
+++ b/lisp/message.el
@@ -1945,7 +1945,7 @@ With prefix-argument just set Follow-Up, don't cross-post."
 	      (not (string-match (regexp-quote target-group)
 				 (message-fetch-field "Newsgroups"))))
 	 (end-of-line)
-	 (insert-string (concat "," target-group))))
+	 (insert (concat "," target-group))))
   (end-of-line) ; ensure Followup: comes after Newsgroups:
   ;; unless new followup would be identical to Newsgroups line
   ;; make a new Followup-To line
diff --git a/lisp/spam.el b/lisp/spam.el
index b1f545c..28a7146 100644
--- a/lisp/spam.el
+++ b/lisp/spam.el
@@ -719,7 +719,7 @@ Uses `gnus-newsgroup-name' if category is nil (for ham registration)."
     (let ((category (or category gnus-newsgroup-name))
           (db-param (spam-get-ifile-database-parameter)))
       (with-temp-buffer
-	(insert-string article-string)
+	(insert article-string)
 	(if db-param
             (call-process-region (point-min) (point-max) spam-ifile-path 
                                  nil nil nil 
@@ -762,7 +762,7 @@ Uses `gnus-newsgroup-name' if category is nil (for ham registration)."
 	 (lambda (article)
 	   (let ((article-string (spam-get-article-as-string article)))
 	     (with-temp-buffer
-	       (insert-string article-string)
+	       (insert article-string)
 	       (spam-stat-buffer-is-spam))))
 	 nil)
 	(spam-stat-save))
@@ -773,7 +773,7 @@ Uses `gnus-newsgroup-name' if category is nil (for ham registration)."
 	 (lambda (article)
 	   (let ((article-string (spam-get-article-as-string article)))
 	     (with-temp-buffer
-	       (insert-string article-string)
+	       (insert article-string)
 	       (spam-stat-buffer-is-non-spam)))))
 	(spam-stat-save)))
 
@@ -927,7 +927,7 @@ Uses `gnus-newsgroup-name' if category is nil (for ham registration)."
   (when (stringp article-string)
     (let ((switch (if spam "-s" "-n")))
       (with-temp-buffer
-	(insert-string article-string)
+	(insert article-string)
 	(if spam-bogofilter-database-directory
 	    (call-process-region (point-min) (point-max) 
 				 spam-bogofilter-path