Commit 9091f2d3 authored by Miles Bader's avatar Miles Bader

Merge from gnus--devo--0

Revision: emacs@sv.gnu.org/emacs--devo--0--patch-1441
parent 2d0e0565
2008-10-03 Katsumi Yamaoka <yamaoka@jpl.org>
* nnml.el (nnml-request-expire-articles): Check if the function set to
`nnmail-expiry-target' returns the symbol `delete'.
* nnfolder.el (nnfolder-request-expire-articles): Ditto.
* nnmail.el (nnmail-expiry-target): Fix custom type.
2008-10-02 Glenn Morris <rgm@gnu.org>
* mm-util.el (mm-codepage-setup): Tweak codepage error.
......
......@@ -472,11 +472,11 @@ the group. Then the marks file will be regenerated properly by Gnus.")
(let ((nnfolder-current-directory nil))
(when (functionp target)
(setq target (funcall target newsgroup)))
(if (and target
(or (gnus-request-group target)
(gnus-request-create-group target)))
(nnmail-expiry-target-group target newsgroup)
(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 newsgroup)
(setq target nil)))))
(nnfolder-possibly-change-group newsgroup server))
(when target
(nnheader-message 5 "Deleting article %d in %s..."
......
......@@ -199,7 +199,7 @@ The return value should be `delete' or a group name (a string)."
:version "21.1"
:group 'nnmail-expire
:type '(choice (const delete)
(function :format "%v" nnmail-)
function
string))
(defcustom nnmail-fancy-expiry-targets nil
......
......@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment