diff options
| author | Lars Magne Ingebrigtsen <larsi@gnus.org> | 2011-06-30 04:07:50 +0000 |
|---|---|---|
| committer | Katsumi Yamaoka <yamaoka@jpl.org> | 2011-06-30 04:07:50 +0000 |
| commit | d0b36cbeb198377ef831a75b75645e76b471e7c1 (patch) | |
| tree | fb08007d7e27abf43b0a110d0a79bc75b3ce107a /lisp/gnus | |
| parent | 94b9acce13573ce598bd9a73ebb273d7e200c09d (diff) | |
| download | emacs-d0b36cbeb198377ef831a75b75645e76b471e7c1.tar.gz emacs-d0b36cbeb198377ef831a75b75645e76b471e7c1.tar.bz2 emacs-d0b36cbeb198377ef831a75b75645e76b471e7c1.zip | |
nnimap.el (nnimap-process-expiry-targets): Say what target we're expiring articles to.
Diffstat (limited to 'lisp/gnus')
| -rw-r--r-- | lisp/gnus/ChangeLog | 3 | ||||
| -rw-r--r-- | lisp/gnus/nnimap.el | 17 |
2 files changed, 13 insertions, 7 deletions
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index 594bef2f01c..5f173b2aeed 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog @@ -6,6 +6,9 @@ 2011-06-30 Lars Magne Ingebrigtsen <larsi@gnus.org> + * nnimap.el (nnimap-process-expiry-targets): Say what target we're + expiring articles to. + * mm-util.el (mm-charset-to-coding-system): Recognise all ANSI.x3.4 variations as ASCII (bug#5458). diff --git a/lisp/gnus/nnimap.el b/lisp/gnus/nnimap.el index e78c20bdeef..e330a4b84e9 100644 --- a/lisp/gnus/nnimap.el +++ b/lisp/gnus/nnimap.el @@ -880,15 +880,18 @@ textual parts.") (with-temp-buffer (mm-disable-multibyte) (when (nnimap-request-article article group server (current-buffer)) - (nnheader-message 7 "Expiring article %s:%d" group article) (when (functionp target) (setq target (funcall target group))) - (when (and target - (not (eq target 'delete))) - (if (or (gnus-request-group target t) - (gnus-request-create-group target)) - (nnmail-expiry-target-group target group) - (setq target nil))) + (if (and target + (not (eq target 'delete))) + (if (or (gnus-request-group target t) + (gnus-request-create-group target)) + (progn + (nnmail-expiry-target-group target group) + (nnheader-message 7 "Expiring article %s:%d to %s" + group article target)) + (setq target nil)) + (nnheader-message 7 "Expiring article %s:%d" group article)) (when target (push article deleted-articles)))))))) ;; Change back to the current group again. |