Mercurial > emacs
diff lisp/gnus/nnml.el @ 98470:be0cd2e19e84
Merge from gnus--devo--0
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-1441
| author | Miles Bader <miles@gnu.org> |
|---|---|
| date | Fri, 03 Oct 2008 04:18:56 +0000 |
| parents | 645fb33380d6 |
| children | a9dc0e7c3f2b |
line wrap: on
line diff
--- a/lisp/gnus/nnml.el Thu Oct 02 20:19:24 2008 +0000 +++ b/lisp/gnus/nnml.el Fri Oct 03 04:18:56 2008 +0000 @@ -364,11 +364,11 @@ nnml-article-file-alist) (when (functionp target) (setq target (funcall target group))) - (if (and target - (or (gnus-request-group target) - (gnus-request-create-group target))) - (nnmail-expiry-target-group target group) - (setq target nil)))) + (when (and target (not (eq target 'delete))) + (if (or (gnus-request-group target) + (gnus-request-create-group target)) + (nnmail-expiry-target-group target group) + (setq target nil))))) ;; Maybe directory is changed during nnmail-expiry-target-group. (nnml-possibly-change-directory group server)) (if target