(rmail-forward): Put the "end" line right after the

forwarded message; the signature goes after.

1 files changed, 5 insertions, 3 deletions

diff --git a/lisp/mail/rmail.el b/lisp/mail/rmail.el
index 099a809bbb7..1065ecc8cb8 100644
--- a/lisp/mail/rmail.el
+++ b/lisp/mail/rmail.el
@@ -2259,18 +2259,20 @@ see the documentation of `rmail-resend'."
             (insert "------- Start of forwarded message -------\n")
             ;; Quote lines with `- ' if they start with `-'.
             (let ((beg (point)) end)
+              (setq end (point-marker))
+              (set-marker-insertion-type end t)
               (insert-buffer-substring forward-buffer)
               (goto-char beg)
               (while (re-search-forward "^-" nil t)
                 (beginning-of-line)
                 (insert "- ")
                 (forward-line 1))
-              (goto-char (point-max)))
-            (let ((end (point)))
+              (goto-char end)
               (skip-chars-backward "\n")
               (if (< (point) end)
                   (forward-char 1))
-              (delete-region (point) end))
+              (delete-region (point) end)
+              (set-marker end nil))
             (insert "------- End of forwarded message -------\n")
             (push-mark))))))