232 |
;; If we are in a summary buffer, switch to the Rmail buffer. |
;; If we are in a summary buffer, switch to the Rmail buffer. |
233 |
(unwind-protect |
(unwind-protect |
234 |
(with-current-buffer rmail-buffer |
(with-current-buffer rmail-buffer |
|
(narrow-to-region (rmail-msgbeg rmail-current-message) |
|
|
(rmail-msgend rmail-current-message)) |
|
235 |
(goto-char (point-min)) |
(goto-char (point-min)) |
236 |
|
(narrow-to-region (point) |
237 |
|
(save-excursion (search-forward "\n\n") (point))) |
238 |
(let ((buffer-read-only nil) |
(let ((buffer-read-only nil) |
239 |
(forwarded-from (mail-fetch-field "From")) |
(old-fwd-from (mail-fetch-field "Forwarded-From" nil nil t)) |
240 |
(forwarded-date (mail-fetch-field "Date")) |
(old-fwd-date (mail-fetch-field "Forwarded-Date" nil nil t)) |
241 |
|
(fwd-from (mail-fetch-field "From")) |
242 |
|
(fwd-date (mail-fetch-field "Date")) |
243 |
beg end prefix forward-msg) |
beg end prefix forward-msg) |
244 |
|
(narrow-to-region (rmail-msgbeg rmail-current-message) |
245 |
|
(rmail-msgend rmail-current-message)) |
246 |
|
(goto-char (point-min)) |
247 |
(cond ((re-search-forward rmail-forward-separator-regex nil t) |
(cond ((re-search-forward rmail-forward-separator-regex nil t) |
248 |
(forward-line 1) |
(forward-line 1) |
249 |
(skip-chars-forward "\n") |
(skip-chars-forward "\n") |
279 |
(narrow-to-region (point) (point)) |
(narrow-to-region (point) (point)) |
280 |
(insert rmail-mail-separator) |
(insert rmail-mail-separator) |
281 |
(narrow-to-region (point) (point)) |
(narrow-to-region (point) (point)) |
282 |
(insert "Forwarded-From: " forwarded-from "\n") |
(while old-fwd-from |
283 |
(insert "Forwarded-Date: " forwarded-date "\n") |
(insert "Forwarded-From: " (car old-fwd-from) "\n") |
284 |
|
(insert "Forwarded-Date: " (car old-fwd-date) "\n") |
285 |
|
(setq old-fwd-from (cdr old-fwd-from)) |
286 |
|
(setq old-fwd-date (cdr old-fwd-date))) |
287 |
|
(insert "Forwarded-From: " fwd-from "\n") |
288 |
|
(insert "Forwarded-Date: " fwd-date "\n") |
289 |
(insert forward-msg) |
(insert forward-msg) |
290 |
(save-restriction |
(save-restriction |
291 |
(goto-char (point-min)) |
(goto-char (point-min)) |