* 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.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f8e36dc..288ba40 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/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-01  Katsumi Yamaoka  <yamaoka@jpl.org>
 
        * lpath.el: Fbind codepage-setup for Emacs 23.
 2008-10-01  Katsumi Yamaoka  <yamaoka@jpl.org>
 
        * lpath.el: Fbind codepage-setup for Emacs 23.

diff --git a/lisp/nnfolder.el b/lisp/nnfolder.el
index 36e0571..629e22c 100644 (file)
--- a/lisp/nnfolder.el
+++ b/lisp/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)))
                (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..."
              (nnfolder-possibly-change-group newsgroup server))
            (when target
              (nnheader-message 5 "Deleting article %d in %s..."

diff --git a/lisp/nnmail.el b/lisp/nnmail.el
index f0419c7..3bc9512 100644 (file)
--- a/lisp/nnmail.el
+++ b/lisp/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)
   :version "21.1"
   :group 'nnmail-expire
   :type '(choice (const delete)

-                (function :format "%v" nnmail-)
+                function

                 string))
 
 (defcustom nnmail-fancy-expiry-targets nil
                 string))
 
 (defcustom nnmail-fancy-expiry-targets nil

diff --git a/lisp/nnml.el b/lisp/nnml.el
index 30a5454..c66a06c 100644 (file)
--- a/lisp/nnml.el
+++ b/lisp/nnml.el
@@ -364,11 +364,11 @@ non-nil.")
                      nnml-article-file-alist)
                  (when (functionp target)
                    (setq target (funcall target group)))
                      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
              ;; Maybe directory is changed during nnmail-expiry-target-group.
              (nnml-possibly-change-directory group server))
            (if target