diff options
| -rw-r--r-- | lisp/gnus/ChangeLog | 7 | ||||
| -rw-r--r-- | lisp/gnus/message.el | 8 |
2 files changed, 13 insertions, 2 deletions
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index 4f244d71522..37345b48ca2 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog @@ -1,3 +1,10 @@ +2009-02-07 Glenn Morris <rgm@gnu.org> + + * 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 <rgm@gnu.org> * gnus-sum.el (gnus-summary-next-article): XEmacs-friendly version of diff --git a/lisp/gnus/message.el b/lisp/gnus/message.el index ee711628080..21b680e3396 100644 --- a/lisp/gnus/message.el +++ b/lisp/gnus/message.el @@ -1824,7 +1824,6 @@ You must have the \"hashcash\" binary installed, see `hashcash-path'." (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 @@ Otherwise, generate and save a value for `canlock-password' first." (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 @@ is for the internal use." (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. |