Merge from gnus--devo--0

Revision: emacs@sv.gnu.org/emacs--devo--0--patch-1441

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index ef5add779b872a1af432a534d1ad189f348ad38b..66fafa90ad60c84d023bc59bd5794eb87bbf7152 100644 (file)
--- 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 36e057148d78ddff065511ce28b8fae5e0aa155b..629e22c6249be6a0260c30dd8d918f957eeaec3f 100644 (file)
--- 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 f0419c7bf5074a933c8026d2f085177f416cdbd1..3bc9512b7c48ab7d4d9c6151509267e82066c5f6 100644 (file)
--- 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 30a54543ad3749ef6eb71aef739d2d0ef5835e15..c66a06c233a5a41b064215478b0b75865b15d6af 100644 (file)
--- 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