From: Karl Heuer <kwzh@gnu.org>
Date: Thu, 11 Jul 1996 23:59:24 +0000 (+0000)
Subject: (rmail-make-basic-summary-line):
X-Git-Tag: emacs-19.34~217
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=b9cbdf4547556cb2184f389bd23546c80575d990;p=emacs.git

(rmail-make-basic-summary-line):
If user-mail-address is nil, use alternative.
---

diff --git a/lisp/mail/rmailsum.el b/lisp/mail/rmailsum.el
index f2134f99934..f9152447733 100644
--- a/lisp/mail/rmailsum.el
+++ b/lisp/mail/rmailsum.el
@@ -365,7 +365,14 @@ nil for FUNCTION means all messages."
 		(if (string-match (concat "^\\("
 					  (regexp-quote (user-login-name))
 					  "\\($\\|@\\)\\|"
-					  (regexp-quote user-mail-address)
+					  (regexp-quote
+					   ;; Don't lose if run from init file
+					   ;; where user-mail-address is not
+					   ;; set yet.
+					   (or user-mail-address
+					       (concat (user-login-name) "@"
+						       (or mail-host-address
+							   (system-name)))))
 					  "\\>\\)")
 				  from)
 		    (save-excursion