diff options
author | Miles Bader <miles@gnu.org> | 2008-10-03 04:18:56 +0000 |
---|---|---|
committer | Miles Bader <miles@gnu.org> | 2008-10-03 04:18:56 +0000 |
commit | 9091f2d335d153b71b0102c9524934eb912e30f1 (patch) | |
tree | 5fb52e4fd8d963379f56dca501ff3fc459d3cfc6 /lisp/gnus/nnml.el | |
parent | 2d0e0565597d306248c60121db39a0948553eb97 (diff) | |
download | emacs-9091f2d335d153b71b0102c9524934eb912e30f1.tar.gz |
Merge from gnus--devo--0
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-1441
Diffstat (limited to 'lisp/gnus/nnml.el')
-rw-r--r-- | lisp/gnus/nnml.el | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/lisp/gnus/nnml.el b/lisp/gnus/nnml.el index 30a54543ad3..c66a06c233a 100644 --- a/lisp/gnus/nnml.el +++ b/lisp/gnus/nnml.el @@ -364,11 +364,11 @@ non-nil.") 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 |