Changes committed gnus/lisp (ChangeLog nnfolder.el nnmail.el nnml.el)

Modified: ChangeLog nnfolder.el nnmail.el nnml.el

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


Index: ChangeLog
diff -u gnus/lisp/ChangeLog:7.1921 gnus/lisp/ChangeLog:7.1922
--- ChangeLog:7.1921	Fri Oct  3 01:44:37 2008
+++ ChangeLog	Fri Oct  3 03:52:25 2008
@@ -1,3 +1,12 @@
+2008-10-03  Katsumi Yamaoka  <[email protected]>
+
+	* 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  <[email protected]>
 
 	* lpath.el: Fbind codepage-setup for Emacs 23.
Index: nnfolder.el
diff -u gnus/lisp/nnfolder.el:7.26 gnus/lisp/nnfolder.el:7.27
--- nnfolder.el:7.26	Fri Oct  3 01:44:37 2008
+++ nnfolder.el	Fri Oct  3 03:52:25 2008
@@ -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..."
Index: nnmail.el
diff -u gnus/lisp/nnmail.el:7.45 gnus/lisp/nnmail.el:7.46
--- nnmail.el:7.45	Wed Jun 11 16:19:44 2008
+++ nnmail.el	Fri Oct  3 03:52:25 2008
@@ -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
Index: nnml.el
diff -u gnus/lisp/nnml.el:7.33 gnus/lisp/nnml.el:7.34
--- nnml.el:7.33	Fri Oct  3 01:44:37 2008
+++ nnml.el	Fri Oct  3 03:52:25 2008
@@ -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