Use $ at end when searching for mail-header-separator.

1 files changed, 6 insertions, 6 deletions

diff --git a/lisp/mail/mail-hist.el b/lisp/mail/mail-hist.el
index 3c9db59b502..6a80398fd46 100644
--- a/lisp/mail/mail-hist.el
+++ b/lisp/mail/mail-hist.el
@@ -3,7 +3,6 @@
 
 ;; Author: Karl Fogel <kfogel@cs.oberlin.edu>
 ;; Created: March, 1994
-;; Version: 1.3
 ;; Keywords: mail, history
 
 ;; This file is part of GNU Emacs.
@@ -99,14 +98,15 @@ Oldest elements are dumped first.")
 Returns nil if not in a header, implying that point is in the body of
 the message."
   (if (save-excursion
-        (re-search-backward (concat "^" (regexp-quote mail-header-separator))
+        (re-search-backward (concat "^" (regexp-quote mail-header-separator)
+                                    "$")
                             nil t))
       nil ; then we are in the body of the message
     (save-excursion
       (let* ((body-start ; limit possibility of false headers
               (save-excursion
                 (re-search-forward
-                 (concat "^" (regexp-quote mail-header-separator))
+                 (concat "^" (regexp-quote mail-header-separator) "$")
                  nil t)))
              (name-start
               (re-search-backward mail-hist-header-regexp nil t))
@@ -127,7 +127,7 @@ colon after the header name, or on the second space following that if
 the header is empty."
   (let ((boundary (save-excursion
                     (re-search-forward
-                     (concat "^" (regexp-quote mail-header-separator))
+                     (concat "^" (regexp-quote mail-header-separator) "$")
                      nil t))))
     (and
      boundary
@@ -174,7 +174,7 @@ colon, or just after the colon if it is not followed by whitespace."
     (let ((start (point)))
       (or (mail-hist-forward-header 1)
           (re-search-forward
-           (concat "^" (regexp-quote mail-header-separator))))
+           (concat "^" (regexp-quote mail-header-separator) "$")))
       (beginning-of-line)
       (buffer-substring start (1- (point))))))
 
@@ -219,7 +219,7 @@ This function normally would be called when the message is sent."
             (save-excursion
             (goto-char (point-min))
             (re-search-forward
-             (concat "^" (regexp-quote mail-header-separator))
+             (concat "^" (regexp-quote mail-header-separator) "$")
              nil)
             (forward-line 1)
             (buffer-substring (point) (point-max)))))