From: yamaoka <yamaoka>
Date: Wed, 10 Mar 2004 11:52:42 +0000 (+0000)
Subject: Synch to No Gnus 200403101152.
X-Git-Tag: t-gnus-6_17_4-quimby-~1019
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f754e9f0bb24e400cc95faf68ca603af8e785ecf;p=elisp%2Fgnus.git-

Synch to No Gnus 200403101152.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 401bcac..bfd61c3 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,11 @@
+2004-03-10  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* mm-decode.el (mm-complicated-handles): New function reviving
+	former definition of mm-multiple-handles.
+
+	* gnus-art.el (gnus-mime-save-part-and-strip): Use it.
+	(gnus-mime-delete-part): Use it.
+
 2004-03-09  Kevin Greiner <kgreiner@xpediantsolutions.com>
 
 	* gnus-agent.el (gnus-agent-read-local): Bind
diff --git a/lisp/gnus-art.el b/lisp/gnus-art.el
index 347b7dd..00dd3aa 100644
--- a/lisp/gnus-art.el
+++ b/lisp/gnus-art.el
@@ -4370,6 +4370,9 @@ and `gnus-mime-delete-part', and not provided at run-time normally."
   (gnus-article-check-buffer)
   (when (gnus-group-read-only-p)
     (error "The current group does not support deleting of parts"))
+  (when (mm-complicated-handles gnus-article-mime-handles)
+    (error "\
+The current article has a complicated MIME structure, giving up..."))
   (when (gnus-yes-or-no-p "\
 Deleting parts may malfunction or destroy the article; continue? ")
     (let* ((data (get-text-property (point) 'gnus-data))
@@ -4401,6 +4404,9 @@ Replace it with some information about the removed part."
   (gnus-article-check-buffer)
   (when (gnus-group-read-only-p)
     (error "The current group does not support deleting of parts"))
+  (when (mm-complicated-handles gnus-article-mime-handles)
+    (error "\
+The current article has a complicated MIME structure, giving up..."))
   (when (gnus-yes-or-no-p "\
 Deleting parts may malfunction or destroy the article; continue? ")
     (let* ((data (get-text-property (point) 'gnus-data))
diff --git a/lisp/mm-decode.el b/lisp/mm-decode.el
index 1c31a2c..45e8199 100644
--- a/lisp/mm-decode.el
+++ b/lisp/mm-decode.el
@@ -1459,6 +1459,10 @@ If RECURSIVE, search recursively."
        (or (listp (car handles))
 	   (stringp (car handles)))))
 
+(defun mm-complicated-handles (handles)
+  (and (listp (car handles))
+       (> (length handles) 1)))
+
 (defun mm-merge-handles (handles1 handles2)
   (append
    (if (listp (car handles1))