[Emacs-diffs] /srv/bzr/emacs/trunk r102939: mm-decode.el (mm-preferred-alternative-precedence): Don't bug out on nested related parts.

[Katsumi Yamaoka]

------------------------------------------------------------
revno: 102939
author: Lars Ingebrigtsen <address@hidden>
committer: Katsumi Yamaoka <address@hidden>
branch nick: trunk
timestamp: Sat 2011-01-22 12:34:50 +0000
message:
  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.
modified:
  lisp/gnus/ChangeLog
  lisp/gnus/mm-decode.el
  lisp/gnus/nnfolder.el

=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog       2011-01-21 23:33:46 +0000
+++ b/lisp/gnus/ChangeLog       2011-01-22 12:34:50 +0000
@@ -1,3 +1,12 @@
+2011-01-22  Lars Ingebrigtsen  <address@hidden>
+
+       * 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  <address@hidden>
 
        * gnus-art.el (gnus-button-alist, gnus-button-handle-info-keystrokes):

=== modified file 'lisp/gnus/mm-decode.el'
--- a/lisp/gnus/mm-decode.el    2011-01-20 23:43:27 +0000
+++ b/lisp/gnus/mm-decode.el    2011-01-22 12:34:50 +0000
@@ -1379,9 +1379,10 @@
        (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))
 

=== modified file 'lisp/gnus/nnfolder.el'
--- a/lisp/gnus/nnfolder.el     2011-01-14 17:18:41 +0000
+++ b/lisp/gnus/nnfolder.el     2011-01-22 12:34:50 +0000
@@ -488,8 +488,8 @@
       (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)