From 9d2f1c1d52309374ab82bd567194d8dc38e14912 Mon Sep 17 00:00:00 2001
From: yamaoka <yamaoka>
Date: Sun, 16 May 2004 14:07:48 +0000
Subject: [PATCH] Synch to No Gnus 200405161305.

---
 lisp/ChangeLog     |   14 ++++++++++++++
 lisp/gnus-agent.el |    4 ++--
 lisp/gnus-art.el   |    2 ++
 lisp/gnus-msg.el   |    9 +++++----
 lisp/nneething.el  |    2 +-
 5 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 9d377d5..b473678 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,17 @@
+2004-05-16  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+	* nneething.el (nneething-file-name): Don't create spurions
+	files. 
+
+	* gnus-msg.el (gnus-inews-do-gcc): Ignore read-only groups. 
+	(gnus-inews-do-gcc): Remove sleep.
+
+	* gnus-art.el (gnus-mime-delete-part): Error message when no MIME
+	part under point.
+
+	* gnus-agent.el (gnus-agent-synchronize-flags): Default to nil. 
+	(gnus-agent-regenerate-group): Using nil messages aren't valid. 
+
 2004-05-15  Teodor Zlatanov  <tzz@lifelogs.com>
 
 	* spam.el (spam-summary-prepare-exit): oops, forgot (length)
diff --git a/lisp/gnus-agent.el b/lisp/gnus-agent.el
index eea914b..73f87b5 100644
--- a/lisp/gnus-agent.el
+++ b/lisp/gnus-agent.el
@@ -124,7 +124,7 @@ fetched will be limited to it. If not a positive integer, never consider it."
   :type '(choice (const nil)
 		 (integer :tag "Number")))
 
-(defcustom gnus-agent-synchronize-flags 'ask
+(defcustom gnus-agent-synchronize-flags nil
   "Indicate if flags are synchronized when you plug in.
 If this is `ask' the hook will query the user."
   :version "21.1"
@@ -3779,7 +3779,7 @@ entry of article %s deleted." l1))
 	(when regenerated
 	    (gnus-agent-update-files-total-fetched-for group nil)))
 
-      (gnus-message 5 nil)
+      (gnus-message 5 "")
       regenerated)))
 
 ;;;###autoload
diff --git a/lisp/gnus-art.el b/lisp/gnus-art.el
index b92c81f..0d5d4cb 100644
--- a/lisp/gnus-art.el
+++ b/lisp/gnus-art.el
@@ -4428,6 +4428,8 @@ Deleting parts may malfunction or destroy the article; continue? ")
 	    (or (mail-content-type-get (mm-handle-disposition data) 'filename)
 		none))
 	   (type (mm-handle-media-type data)))
+      (unless data
+	(error "No MIME part under point"))
       (with-current-buffer (mm-handle-buffer data)
 	(let ((bsize (format "%s" (buffer-size))))
 	  (erase-buffer)
diff --git a/lisp/gnus-msg.el b/lisp/gnus-msg.el
index c7cbf23..ff1e444 100644
--- a/lisp/gnus-msg.el
+++ b/lisp/gnus-msg.el
@@ -1861,11 +1861,12 @@ this is a reply."
 		     (concat "^" (regexp-quote mail-header-separator) "$")
 		     nil t)
 		(replace-match "" t t ))
-	      (unless (setq group-art
-			    (gnus-request-accept-article group method t t))
+	      (when (or (gnus-group-read-only-p group)
+			(not (setq group-art
+				   (gnus-request-accept-article
+				    group method t t))))
 		(gnus-message 1 "Couldn't store article in group %s: %s"
-			      group (gnus-status-message method))
-		(sit-for 2))
+			      group (gnus-status-message method)))
 	      (when (and group-art
 			 ;; FIXME: Should gcc-mark-as-read work when
 			 ;; Gnus is not running?
diff --git a/lisp/nneething.el b/lisp/nneething.el
index 420d7f9..628e2a4 100644
--- a/lisp/nneething.el
+++ b/lisp/nneething.el
@@ -521,7 +521,7 @@ This variable is used as the alternative of `mailcap-mime-extensions'.")
     (if (numberp article)
 	(if (setq fname (cadr (assq article nneething-map)))
 	    (expand-file-name fname dir)
-	  (mm-make-temp-file (expand-file-name "nneething" dir)))
+	  (make-temp-name (expand-file-name "nneething" dir)))
       (expand-file-name article dir))))
 
 (provide 'nneething)
-- 
1.7.10.4