# HG changeset patch
# User Glenn Morris <rgm@gnu.org>
# Date 1234588153 0
# Node ID 55b8ba83f74b379e96756216456d090eaa1584eb
# Parent  a41e65af8655eb651113d2ee8ac4878df6c80a87
(rmail-output-to-rmail-file): Remove autoload added in previous change.
(gnus-summary-save-in-mail): Use gnus-output-to-rmail rather than
rmail-output-to-rmail-file.

diff -r a41e65af8655 -r 55b8ba83f74b lisp/gnus/ChangeLog
--- a/lisp/gnus/ChangeLog	Sat Feb 14 04:19:34 2009 +0000
+++ b/lisp/gnus/ChangeLog	Sat Feb 14 05:09:13 2009 +0000
@@ -2,14 +2,14 @@
 
 	* gnus.el (rmail-default-rmail-file): Remove declaration of deleted
 	variable (only used in gnus-util, which declares it anyway).
-	(rmail-output-to-rmail-file): Move autoload to gnus-art, the only place
-	that uses it.
+	(rmail-output-to-rmail-file): Remove autoload of deleted function,
+	which was only needed by gnus-art (changed to not use it any more).
 	(rmail-insert-rmail-file-header): Remove autoload of deleted function,
 	only used in gnus-util, which autoloads it itself.
 	(rmail-update-summary): Fix autoload.
 
-	* gnus-art.el (rmail-output-to-rmail-file): Move autoload here
-	from gnus.el.
+	* gnus-art.el (gnus-summary-save-in-mail): Use gnus-output-to-rmail
+	rather than rmail-output-to-rmail-file.
 
 2009-02-07  Glenn Morris  <rgm@gnu.org>
 
diff -r a41e65af8655 -r 55b8ba83f74b lisp/gnus/gnus-art.el
--- a/lisp/gnus/gnus-art.el	Sat Feb 14 04:19:34 2009 +0000
+++ b/lisp/gnus/gnus-art.el	Sat Feb 14 05:09:13 2009 +0000
@@ -537,6 +537,7 @@
   :group 'gnus-article-saving
   :type 'regexp)
 
+;; Note that "Rmail format" is mbox since Emacs 23, but Babyl before.
 (defcustom gnus-default-article-saver 'gnus-summary-save-in-rmail
   "A function to save articles in your favourite format.
 The function will be called by way of the `gnus-summary-save-article'
@@ -3876,12 +3877,12 @@
     (save-excursion
       (save-restriction
 	(widen)
+	;; Note that unlike gnus-summary-save-in-mail, there is no
+	;; check to see if filename is Babyl.  Rmail in Emacs 23 does
+	;; not use Babyl.
 	(gnus-output-to-rmail filename))))
   filename)
 
-;; FIXME deleted in Emacs 23.
-(autoload 'rmail-output-to-rmail-file "rmailout")
-
 (defun gnus-summary-save-in-mail (&optional filename)
   "Append this article to Unix mail file.
 Optional argument FILENAME specifies file name.
@@ -3897,7 +3898,7 @@
 	(if (and (file-readable-p filename)
 		 (file-regular-p filename)
 		 (mail-file-babyl-p filename))
-	    (rmail-output-to-rmail-file filename t)
+	    (gnus-output-to-rmail filename)
 	  (gnus-output-to-mail filename)))))
   filename)