[Emacs-diffs] Changes to emacs/lisp/mail/uce.el

[Eli Zaretskii]

Index: emacs/lisp/mail/uce.el
diff -c emacs/lisp/mail/uce.el:1.8 emacs/lisp/mail/uce.el:1.9
*** emacs/lisp/mail/uce.el:1.8  Fri Jul 13 08:59:13 2001
--- emacs/lisp/mail/uce.el      Sat Feb  2 11:52:49 2002
***************
*** 222,231 ****
         (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")))))
      (or (get-buffer message-buffer)
        (error (concat "No buffer " message-buffer ", cannot find UCE")))
      (switch-to-buffer message-buffer)
      (let ((to (mail-strip-quoted-names (mail-fetch-field "from" t)))
          (reply-to (mail-fetch-field "reply-to"))
          temp)
--- 222,236 ----
         (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"))))
!       (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,259 ****
--- 259,267 ----
                 (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))