(rmail-retry-failure): Use rmail-get-header rather than a magical

save-excursion/restriction combination that does nothing.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 1225b820ad4fe5062c71d65dbf38e94925cba233..18526ec650c964bd378089a953118773b5c98fb3 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -5,9 +5,11 @@
 
        * mail/rmail.el (rmail-reply): Use rmail-apply-in-message so that this
        function has access to all the headers, not just the visible ones.
+       Avoid extraneous leading whitespace in `References'.
        (rmail-dont-reply-to-names, rmail-default-dont-reply-to-names):
        Doc fixes.
-       (rmail-reply): Avoid extraneous leading whitespace.
+       (rmail-retry-failure): Use rmail-get-header rather than a magical
+       save-excursion/restriction combination that does nothing.
 
 2009-03-01  Chong Yidong  <cyd@stupidchicken.com>
 

diff --git a/lisp/mail/rmail.el b/lisp/mail/rmail.el
index 8006fcdadaf7f88a6b4babf2ba9bff9ef68cd916..30cd9c092ffeb652a3380737bf863b6866382e39 100644 (file)
--- a/lisp/mail/rmail.el
+++ b/lisp/mail/rmail.el
@@ -3640,12 +3640,7 @@ specifying headers which should not be copied into the new message."
   (let ((rmail-this-buffer (current-buffer))
        (msgnum rmail-current-message)
        bounce-start bounce-end bounce-indent resending
-       ;; Fetch any content-type header in current message
-       ;; Must search thru the whole unpruned header.
-       (content-type
-        (save-excursion
-          (save-restriction
-            (mail-fetch-field "Content-Type") ))))
+       (content-type (rmail-get-header "Content-Type")))
     (save-excursion
       (goto-char (point-min))
       (let ((case-fold-search t))