From: Richard M. Stallman <rms@gnu.org>
Date: Sat, 2 May 1998 06:50:44 +0000 (+0000)
Subject: (rfc822-goto-eoh): Stop at a blank line, too.
X-Git-Tag: emacs-20.3~1171
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=360b548370c883d3e0b8df6aa08f6c714eccfe8f;p=emacs.git

(rfc822-goto-eoh): Stop at a blank line, too.

(rfc822-goto-eoh): New function.
(sendmail-user-agent-compose): Use rfc822-goto-eoh.
---

diff --git a/lisp/simple.el b/lisp/simple.el
index 2b9e0266020..9e79a114891 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -3450,6 +3450,13 @@ Unibyte strings are converted to multibyte for comparison."
   'sendmail-user-agent-compose
   'mail-send-and-exit)
 
+(defun rfc822-goto-eoh ()
+  ;; Go to header delimiter line in a mail message, following RFC822 rules
+  (goto-char (point-min))
+  (while (looking-at "^[^: \n]+:\\|^[ \t]")
+    (forward-line 1))
+  (point))
+
 (defun sendmail-user-agent-compose (&optional to subject other-headers continue
 					      switch-function yank-action
 					      send-actions)
@@ -3465,9 +3472,7 @@ Unibyte strings are converted to multibyte for comparison."
 	continue
 	(error "Message aborted"))
     (save-excursion
-      (goto-char (point-min))
-      (search-forward mail-header-separator)
-      (beginning-of-line)
+      (rfc822-goto-eoh)
       (while other-headers
 	(if (not (member (car (car other-headers)) '("in-reply-to" "cc")))
 	    (insert (car (car other-headers)) ": "