# HG changeset patch
# User Miles Bader <miles@gnu.org>
# Date 1223007536 0
# Node ID be0cd2e19e849a399fb05ed442e0ecd61aaefd8c
# Parent  b47418363c13615e6b2f3100b1e12669fde5ff3c
Merge from gnus--devo--0

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

diff -r b47418363c13 -r be0cd2e19e84 lisp/gnus/ChangeLog
--- a/lisp/gnus/ChangeLog	Thu Oct 02 20:19:24 2008 +0000
+++ b/lisp/gnus/ChangeLog	Fri Oct 03 04:18:56 2008 +0000
@@ -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 -r b47418363c13 -r be0cd2e19e84 lisp/gnus/nnfolder.el
--- a/lisp/gnus/nnfolder.el	Thu Oct 02 20:19:24 2008 +0000
+++ b/lisp/gnus/nnfolder.el	Fri Oct 03 04:18:56 2008 +0000
@@ -472,11 +472,11 @@
 		(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 -r b47418363c13 -r be0cd2e19e84 lisp/gnus/nnmail.el
--- a/lisp/gnus/nnmail.el	Thu Oct 02 20:19:24 2008 +0000
+++ b/lisp/gnus/nnmail.el	Fri Oct 03 04:18:56 2008 +0000
@@ -199,7 +199,7 @@
   :version "21.1"
   :group 'nnmail-expire
   :type '(choice (const delete)
-		 (function :format "%v" nnmail-)
+		 function
 		 string))
 
 (defcustom nnmail-fancy-expiry-targets nil
diff -r b47418363c13 -r be0cd2e19e84 lisp/gnus/nnml.el
--- a/lisp/gnus/nnml.el	Thu Oct 02 20:19:24 2008 +0000
+++ b/lisp/gnus/nnml.el	Fri Oct 03 04:18:56 2008 +0000
@@ -364,11 +364,11 @@
 		      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