(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 --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index ed0ead7..b23626e 100644 (file)
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -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 --git a/lisp/gnus/gnus-art.el b/lisp/gnus/gnus-art.el
index fa45f87..d7ef013 100644 (file)
--- a/lisp/gnus/gnus-art.el
+++ b/lisp/gnus/gnus-art.el
@@ -537,6 +537,7 @@ that the symbol of the saver function, which is specified by
   :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 @@ Directory to save to is default to `gnus-article-save-directory'."
     (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 @@ Directory to save to is default to `gnus-article-save-directory'."
        (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)