Commit f04f5c76 authored by Eli Zaretskii's avatar Eli Zaretskii
Browse files

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

the message text into the *mail* buffer, and restore the pruned
state after that.
parent d54f26b1
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> 2002-02-02 Pavel Jan,Bm(Bk <Pavel@Janik.cz>
   
* cus-edit.el (customize-save-variable): Fix typo in prompt. * cus-edit.el (customize-save-variable): Fix typo in prompt.
......
...@@ -222,10 +222,15 @@ address, and postmaster of the mail relay used." ...@@ -222,10 +222,15 @@ address, and postmaster of the mail relay used."
(cond ((eq uce-mail-reader 'gnus) gnus-original-article-buffer) (cond ((eq uce-mail-reader 'gnus) gnus-original-article-buffer)
((eq uce-mail-reader 'rmail) "RMAIL") ((eq uce-mail-reader 'rmail) "RMAIL")
(t (error (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) (or (get-buffer message-buffer)
(error (concat "No buffer " message-buffer ", cannot find UCE"))) (error (concat "No buffer " message-buffer ", cannot find UCE")))
(switch-to-buffer message-buffer) (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))) (let ((to (mail-strip-quoted-names (mail-fetch-field "from" t)))
(reply-to (mail-fetch-field "reply-to")) (reply-to (mail-fetch-field "reply-to"))
temp) temp)
...@@ -254,6 +259,9 @@ address, and postmaster of the mail relay used." ...@@ -254,6 +259,9 @@ address, and postmaster of the mail relay used."
(rmail-maybe-set-message-counters) (rmail-maybe-set-message-counters)
(copy-region-as-kill (rmail-msgbeg rmail-current-message) (copy-region-as-kill (rmail-msgbeg rmail-current-message)
(rmail-msgend 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*") (switch-to-buffer "*mail*")
(erase-buffer) (erase-buffer)
(setq temp (point)) (setq temp (point))
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment