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 | |
| parent | 2d0e0565597d306248c60121db39a0948553eb97 (diff) | |
| download | emacs-9091f2d335d153b71b0102c9524934eb912e30f1.tar.gz | |
Merge from gnus--devo--0
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-1441
| -rw-r--r-- | lisp/gnus/ChangeLog | 9 | ||||
| -rw-r--r-- | lisp/gnus/nnfolder.el | 10 | ||||
| -rw-r--r-- | lisp/gnus/nnmail.el | 2 | ||||
| -rw-r--r-- | lisp/gnus/nnml.el | 10 |
4 files changed, 20 insertions, 11 deletions
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index ef5add779b8..66fafa90ad6 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog @@ -1,3 +1,12 @@ +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. diff --git a/lisp/gnus/nnfolder.el b/lisp/gnus/nnfolder.el index 36e057148d7..629e22c6249 100644 --- a/lisp/gnus/nnfolder.el +++ b/lisp/gnus/nnfolder.el @@ -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..." diff --git a/lisp/gnus/nnmail.el b/lisp/gnus/nnmail.el index f0419c7bf50..3bc9512b7c4 100644 --- a/lisp/gnus/nnmail.el +++ b/lisp/gnus/nnmail.el @@ -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 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 |