[Emacs-diffs] emacs/lisp/gnus ChangeLog message.el

[Glenn Morris]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Glenn Morris <gm>       09/02/07 22:41:05

Modified files:
        lisp/gnus      : ChangeLog message.el 

Log message:
        (rmail-msg-restore-non-pruned-header): Remove unneeded autoload of
        function that no longer exists.
        (rmail-toggle-header): Declare.
        (message-forward-rmail-make-body): Handle mbox Rmail.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/gnus/ChangeLog?cvsroot=emacs&r1=1.794&r2=1.795
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/gnus/message.el?cvsroot=emacs&r1=1.168&r2=1.169

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/gnus/ChangeLog,v
retrieving revision 1.794
retrieving revision 1.795
diff -u -b -r1.794 -r1.795
--- ChangeLog   5 Feb 2009 02:34:34 -0000       1.794
+++ ChangeLog   7 Feb 2009 22:41:04 -0000       1.795
@@ -1,3 +1,10 @@
+2009-02-07  Glenn Morris  <address@hidden>
+
+       * message.el (rmail-msg-restore-non-pruned-header): Remove unneeded
+       autoload of function that no longer exists.
+       (rmail-toggle-header): Declare.
+       (message-forward-rmail-make-body): Handle mbox Rmail.
+
 2009-01-31  Glenn Morris  <address@hidden>
 
        * gnus-sum.el (gnus-summary-next-article): XEmacs-friendly version of

Index: message.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/gnus/message.el,v
retrieving revision 1.168
retrieving revision 1.169
diff -u -b -r1.168 -r1.169
--- message.el  9 Jan 2009 03:01:50 -0000       1.168
+++ message.el  7 Feb 2009 22:41:04 -0000       1.169
@@ -1824,7 +1824,6 @@
 (autoload 'nnvirtual-find-group-art "nnvirtual")
 (autoload 'rmail-dont-reply-to "mail-utils")
 (autoload 'rmail-msg-is-pruned "rmail")
-(autoload 'rmail-msg-restore-non-pruned-header "rmail")
 (autoload 'rmail-output "rmailout")
 
 
@@ -5222,6 +5221,7 @@
            (if (and message-fcc-handler-function
                     (not (eq message-fcc-handler-function 'rmail-output)))
                (funcall message-fcc-handler-function file)
+             ;; FIXME broken in Emacs CVS?  Does it work in 22?
              (if (and (file-readable-p file) (mail-file-babyl-p file))
                  (rmail-output file 1 nil t)
                (let ((mail-use-rfc822 t))
@@ -7232,12 +7232,16 @@
       (message-forward-make-body-plain forward-buffer)))
   (message-position-point))
 
+(declare-function rmail-toggle-header "rmail" (&optional arg))
+
 ;;;###autoload
 (defun message-forward-rmail-make-body (forward-buffer)
   (save-window-excursion
     (set-buffer forward-buffer)
     (if (rmail-msg-is-pruned)
-       (rmail-msg-restore-non-pruned-header)))
+       (if (fboundp 'rmail-msg-restore-non-pruned-header)
+           (rmail-msg-restore-non-pruned-header) ; Emacs 22
+         (rmail-toggle-header 0))))              ; Emacs 23
   (message-forward-make-body forward-buffer))
 
 ;; Fixme: Should have defcustom.