diff options
| author | Lars Ingebrigtsen <larsi@gnus.org> | 2011-01-22 12:34:50 +0000 |
|---|---|---|
| committer | Katsumi Yamaoka <yamaoka@jpl.org> | 2011-01-22 12:34:50 +0000 |
| commit | acf151a81563f6ab5cecac4b4501c18d1961982b (patch) | |
| tree | ec526f05e128c2b4f3b800c1f98ae0d8f48c256c /lisp/gnus/nnfolder.el | |
| parent | 3fb695589ee812eb8221a72dcdc55cb75e0ca71d (diff) | |
| download | emacs-acf151a81563f6ab5cecac4b4501c18d1961982b.tar.gz | |
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.
Diffstat (limited to 'lisp/gnus/nnfolder.el')
| -rw-r--r-- | lisp/gnus/nnfolder.el | 4 |
1 files changed, 2 insertions, 2 deletions
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) |