From: Richard M. Stallman <rms@gnu.org>
Date: Tue, 12 Aug 1997 05:49:26 +0000 (+0000)
Subject: (rmail-make-in-reply-to-field): Don't cause an
X-Git-Tag: emacs-20.1~633
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=8148a3adf7134015475cd1b33747dc2ae5f4a84e;p=emacs.git

(rmail-make-in-reply-to-field): Don't cause an
error if the `From:' line has no valid email addresses.
---

diff --git a/lisp/mail/rmail.el b/lisp/mail/rmail.el
index 2b2e8cac3fe..2b4c8c6553a 100644
--- a/lisp/mail/rmail.el
+++ b/lisp/mail/rmail.el
@@ -2527,12 +2527,14 @@ which is an element of rmail-msgref-vector."
          (require 'rfc822)
          (let ((tem (car (rfc822-addresses from))))
            (if message-id
-               (if (string-match
-                    (regexp-quote (if (string-match "@[^@]*\\'" tem)
-                                      (substring tem 0 (match-beginning 0))
-                                      tem))
-                    message-id)
-                   ;; Message-ID is sufficiently informative
+               (if (or (not tem)
+		       (string-match
+			(regexp-quote (if (string-match "@[^@]*\\'" tem)
+					  (substring tem 0
+						     (match-beginning 0))
+					tem))
+			message-id))
+                   ;; missing From, or Message-ID is sufficiently informative
                    message-id
                    (concat message-id " (" tem ")"))
 	     ;; Copy TEM, discarding text properties.