mm-decode.el (mm-preferred-alternative-precedence): Don't bug out on nested related parts.

nnfolder.el (nnfolder-request-expire-articles): Return the list of unexpired articles.  This fixes the regression that led expiry marks to disappear from nnfolder groups.

3 files changed, 15 insertions, 5 deletions

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 807bdc00ebd..d55140ada42 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,12 @@
+2011-01-22  Lars Ingebrigtsen  <larsi@gnus.org>
+
+        * mm-decode.el (mm-preferred-alternative-precedence): Don't bug out on
+        nested related parts.
+
+        * nnfolder.el (nnfolder-request-expire-articles): Return the list of
+        unexpired articles.  This fixes the regression that led expiry marks to
+        disappear from nnfolder groups.
+
 2011-01-21  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * gnus-art.el (gnus-button-alist, gnus-button-handle-info-keystrokes):
diff --git a/lisp/gnus/mm-decode.el b/lisp/gnus/mm-decode.el
index 40cfa9b2453..ea65dd6fc92 100644
--- a/lisp/gnus/mm-decode.el
+++ b/lisp/gnus/mm-decode.el
@@ -1379,9 +1379,10 @@ Use CMD as the process."
         (setq handles (nconc (delete handle handles) (list handle))))))
   ;; Remove empty parts.
   (dolist (handle (copy-sequence handles))
-    (unless (with-current-buffer (mm-handle-buffer handle)
-              (goto-char (point-min))
-              (re-search-forward "[^ \t\n]" nil t))
+    (when (and (bufferp (mm-handle-buffer handle))
+               (not (with-current-buffer (mm-handle-buffer handle)
+                      (goto-char (point-min))
+                      (re-search-forward "[^ \t\n]" nil t))))
       (setq handles (nconc (delete handle handles) (list handle)))))
   (mapcar #'mm-handle-media-type handles))
 
diff --git a/lisp/gnus/nnfolder.el b/lisp/gnus/nnfolder.el
index a264bc24c15..826de8b38d3 100644
--- a/lisp/gnus/nnfolder.el
+++ b/lisp/gnus/nnfolder.el
@@ -488,8 +488,8 @@ the group.  Then the marks file will be regenerated properly by Gnus.")
       (nnfolder-save-buffer)
       (nnfolder-adjust-min-active newsgroup)
       (nnfolder-save-active nnfolder-group-alist nnfolder-active-file)
-      (gnus-sorted-difference articles (nreverse deleted-articles)))
-    (nnfolder-save-all-buffers)))
+      (nnfolder-save-all-buffers)
+      (gnus-sorted-difference articles (nreverse deleted-articles)))))
 
 (deffoo nnfolder-request-move-article (article group server accept-form
                                                &optional last move-is-internal)