(uce-reply-to-uce): Prune the headers before copying

the message text into the *mail* buffer, and restore the pruned
state after that.

2 files changed, 19 insertions, 1 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index dabce299022..45f287c5a3b 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,13 @@
+2002-02-02  Eli Zaretskii  <eliz@is.elta.co.il>
+
+        * mail/uce.el (uce-reply-to-uce): Prune the headers before copying
+        the message text into the *mail* buffer, and restore the pruned
+        state after that.
+
+        * mail/rmail.el (rmail-redecode-body): Prune the headers before
+        looking for X-Coding-System header, and restore the pruned state
+        before returning.
+
 2002-02-02  Pavel Jan,Bm(Bk  <Pavel@Janik.cz>
 
         * cus-edit.el (customize-save-variable): Fix typo in prompt.
diff --git a/lisp/mail/uce.el b/lisp/mail/uce.el
index 3d11b7f8482..8b86dc68dc2 100644
--- a/lisp/mail/uce.el
+++ b/lisp/mail/uce.el
@@ -222,10 +222,15 @@ address, and postmaster of the mail relay used."
          (cond ((eq uce-mail-reader 'gnus) gnus-original-article-buffer)
                ((eq uce-mail-reader 'rmail) "RMAIL")
                (t (error 
-                   "Variable uce-mail-reader set to unrecognized value")))))
+                   "Variable uce-mail-reader set to unrecognized value"))))
+        (full-header-p (and (eq uce-mail-reader 'rmail)
+                            (not (rmail-msg-is-pruned)))))
     (or (get-buffer message-buffer)
         (error (concat "No buffer " message-buffer ", cannot find UCE")))
     (switch-to-buffer message-buffer)
+    ;; We need the message with headers pruned.
+    (if full-header-p
+        (rmail-toggle-header 1))
     (let ((to (mail-strip-quoted-names (mail-fetch-field "from" t)))
           (reply-to (mail-fetch-field "reply-to"))
           temp)
@@ -254,6 +259,9 @@ address, and postmaster of the mail relay used."
                  (rmail-maybe-set-message-counters)
                  (copy-region-as-kill (rmail-msgbeg rmail-current-message) 
                                       (rmail-msgend rmail-current-message))))))
+      ;; Restore the pruned header state we found.
+      (if full-header-p
+          (rmail-toggle-header 0))
       (switch-to-buffer "*mail*")
       (erase-buffer)
       (setq temp (point))