Picons broken in 0.55 (was Re: pgnus 0.55 Summary Mode line broken)

[Mike McEwan <mike@lotusland.demon.co.uk>]

Lars Magne Ingebrigtsen <larsi@gnus.org> writes:

> Graham Murray <graham@barnowl.demon.co.uk> writes:
> 
> > It seems as though the Article buffer mode line is being updated
> > into the Summary buffer line rather than its own.
> 
> Yup.  Fix in Pterodactyl Gnus v0.56.

  Pgnus-0.55 breaks picons in the article buffer for the same
reason. In the meantime I'm applying the following patch. It removes
the `save-selected-window' stuff from the top of
`gnus-display-mime'. 

  Lars, presumably this was put there for a reason, although I've not
discovered any more breakage (yet) after its removal?

--- gnus-art.el	1998/11/29 01:29:53	1.1.1.12
+++ gnus-art.el	1998/11/29 14:13:22
@@ -2497,34 +2497,30 @@
 
 (defun gnus-display-mime (&optional ihandles)
   "Insert MIME buttons in the buffer."
-  (save-selected-window
-    (let ((window (get-buffer-window gnus-article-buffer)))
-      (when window
-	(select-window window)))
-    (let* ((handles (or ihandles (mm-dissect-buffer) (mm-uu-dissect)))
-	   handle name type b e display)
+  (let* ((handles (or ihandles (mm-dissect-buffer) (mm-uu-dissect)))
+	 handle name type b e display)
+    (unless ihandles
+      ;; Top-level call; we clean up.
+      (mm-destroy-parts gnus-article-mime-handles)
+      (setq gnus-article-mime-handles handles
+	    gnus-article-mime-handle-alist nil)
+      ;; We allow users to glean info from the handles.
+      (when gnus-article-mime-part-function
+	(gnus-mime-part-function handles)))
+    (when (and handles
+	       (or (not (stringp (car handles)))
+		   (cdr handles)))
       (unless ihandles
-	;; Top-level call; we clean up.
-	(mm-destroy-parts gnus-article-mime-handles)
-	(setq gnus-article-mime-handles handles
-	      gnus-article-mime-handle-alist nil)
-	;; We allow users to glean info from the handles.
-	(when gnus-article-mime-part-function
-	  (gnus-mime-part-function handles)))
-      (when (and handles
-		 (or (not (stringp (car handles)))
-		     (cdr handles)))
-	(unless ihandles
-	  ;; Clean up for mime parts.
-	  (article-goto-body)
-	  (delete-region (point) (point-max)))
-	(if (stringp (car handles))
-	    (if (equal (car handles) "multipart/alternative")
-		(let ((id (1+ (length gnus-article-mime-handle-alist))))
-		  (push (cons id handles) gnus-article-mime-handle-alist)
-		  (gnus-mime-display-alternative (cdr handles) nil nil id))
-	      (gnus-mime-display-mixed (cdr handles)))
-	  (gnus-mime-display-single handles))))))
+	;; Clean up for mime parts.
+	(article-goto-body)
+	(delete-region (point) (point-max)))
+      (if (stringp (car handles))
+	  (if (equal (car handles) "multipart/alternative")
+	      (let ((id (1+ (length gnus-article-mime-handle-alist))))
+		(push (cons id handles) gnus-article-mime-handle-alist)
+		(gnus-mime-display-alternative (cdr handles) nil nil id))
+	    (gnus-mime-display-mixed (cdr handles)))
+	(gnus-mime-display-single handles)))))
 
 (defun gnus-mime-part-function (handles)
   (if (stringp (car handles))

-- 
Mike.