Mercurial > emacs
changeset 25535:2fe0f62fa349
(mh-forward): Get new subject line from the original,
not from the draft to forward.
| author | Richard M. Stallman <rms@gnu.org> |
|---|---|
| date | Sat, 04 Sep 1999 00:08:17 +0000 |
| parents | 297c943363ed |
| children | 2cfdaebe325c |
| files | lisp/mail/mh-comp.el |
| diffstat | 1 files changed, 14 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/mail/mh-comp.el Fri Sep 03 23:57:31 1999 +0000 +++ b/lisp/mail/mh-comp.el Sat Sep 04 00:08:17 1999 +0000 @@ -26,7 +26,7 @@ ;;; Change Log: -;; $Id: mh-comp.el,v 1.13 1998/06/24 09:16:26 schwab Exp kwzh $ +;; $Id: mh-comp.el,v 1.14 1999/03/01 03:47:07 kwzh Exp rms $ ;;; Code: @@ -307,23 +307,27 @@ (mh-insert-fields "To:" to "Cc:" cc) (save-buffer))) (t - (mh-read-draft "" draft-name nil))))) + (mh-read-draft "" draft-name nil)))) + (fwd-msg-file (mh-msg-filename (if (numberp msg-or-seq) + msg-or-seq + (car (mh-seq-to-msgs msg-or-seq))) + folder))) (let (orig-from orig-subject) - (goto-char (point-min)) - (re-search-forward "^------- Forwarded Message") - (forward-line 1) - (skip-chars-forward " \t\n") - (save-restriction - (narrow-to-region (point) (point-max)) + (save-excursion + (set-buffer (get-buffer-create mh-temp-buffer)) + (erase-buffer) + (insert-file-contents fwd-msg-file) (setq orig-from (mh-get-header-field "From:")) (setq orig-subject (mh-get-header-field "Subject:"))) (let ((forw-subject (mh-forwarded-letter-subject orig-from orig-subject))) (mh-insert-fields "Subject:" forw-subject) (goto-char (point-min)) - (re-search-forward "^------- Forwarded Message") - (forward-line -1) + (if (re-search-forward "^------- Forwarded Message" nil t) + (forward-line -1) + (re-search-forward "^--------") + (forward-line 1)) (delete-other-windows) (if (numberp msg-or-seq) (mh-add-msgs-to-seq msg-or-seq 'forwarded t)