summaryrefslogtreecommitdiff
path: root/lisp/mail
diff options
context:
space:
mode:
authorRichard M. Stallman <rms@gnu.org>1997-08-12 05:49:26 +0000
committerRichard M. Stallman <rms@gnu.org>1997-08-12 05:49:26 +0000
commita33269c9141aafcb169d1452e25dec469c550957 (patch)
tree7f148d7d8267ca25635ce71fb17f5fe3d04317b3 /lisp/mail
parentd57b47bd0d222dde44cbc66a53fddebc43d2022d (diff)
downloademacs-a33269c9141aafcb169d1452e25dec469c550957.tar.gz
(rmail-make-in-reply-to-field): Don't cause an
error if the `From:' line has no valid email addresses.
Diffstat (limited to 'lisp/mail')
-rw-r--r--lisp/mail/rmail.el14
1 files changed, 8 insertions, 6 deletions
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.