Re: Test: alternative multipart in a mixed multipart

[Shenghuo ZHU <zsh@cs.rochester.edu>]

After applying the patch, it will shown as

[1. text/plain]
Part1


[*] text/plain          [ ] image/gif           

Test

  
[2. text/plain]

Part3

This patch is a bit ugly. It seems better to split
gnus-mime-display-alternative into initial function and callback
function.

-- 
Shenghuo

:- cut --------------------------------
--- ChangeLog	1998/10/25 04:56:31	1.1
+++ ChangeLog	1998/10/25 05:01:04
@@ -1,3 +1,8 @@
+Sun Oct 25 00:59:23 1998  Shenghuo ZHU  <zsh@cs.rochester.edu>
+
+	* gnus-art.el (gnus-mime-display-alternative): Show alternative
+ 	multipart with other parts in a mixed multipart.
+
 Sat Oct 24 16:48:51 1998  Shenghuo ZHU  <zsh@cs.rochester.edu>
 
 	* mm-uu.el (mm-uu-dissect): Delete the begining spurious newline

--- gnus-art.el	1998/10/25 04:56:12	1.1
+++ gnus-art.el	1998/10/25 04:57:37
@@ -2400,18 +2400,14 @@
       (goto-char (point-max)))))
 
 (defun gnus-mime-display-alternative (handles &optional preferred)
-  (let* ((preferred (mm-preferred-alternative handles preferred))
+  (let* ((is-callback preferred)
+	 (preferred (mm-preferred-alternative handles preferred))
 	 (ihandles handles)
 	 (point (point))
 	 handle buffer-read-only from)
-    (goto-char (point-min))
-    (search-forward "\n\n" nil t)
-    (delete-region (point) (point-max))
-    (when preferred
-      ;; Top-level call; we clean up.
-      (mm-remove-parts gnus-article-mime-handles)
-      (setq gnus-article-mime-handles handles
-	    gnus-article-mime-handle-alist nil))
+    (when is-callback
+      (delete-region (gnus-point-at-bol) (progn (forward-line 1) (point)))
+      (mm-remove-parts handles))
     (while (setq handle (pop handles))
       (gnus-add-text-properties
        (setq from (point))
@@ -2437,12 +2433,18 @@
 			     :action 'gnus-widget-press-button
 			     :button-keymap gnus-widget-button-keymap)
       (insert "  "))
-    (insert "\n\n")
+    (insert "\n")
+    (if is-callback nil
+      (insert "\n")
+      (goto-char (point-max)))
     (when preferred
       (if (stringp (car preferred))
 	  (gnus-display-mime preferred)
 	(mm-display-part preferred)))
-    (goto-char point)))
+    (if is-callback
+	(goto-char point)
+      (goto-char (point-max))
+      (insert "\n"))))
 
 (defun gnus-article-wash-status ()
   "Return a string which display status of article washing."