(message-make-fqdn): Protect against nil user-mail.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index fd74aca..eb86842 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2003-03-01  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+       * message.el (message-make-fqdn): Protect against nil user-mail. 
+
 2003-02-28  Vasily Korytov <deskpot@myrealbox.com>
 
        * gnus-art.el (gnus-boring-article-headers): New values:

diff --git a/lisp/message.el b/lisp/message.el
index 9782827..a9faf5e 100644 (file)
--- a/lisp/message.el
+++ b/lisp/message.el
@@ -4530,7 +4530,8 @@ give as trustworthy answer as possible."
   (let* ((system-name (system-name))
         (user-mail (message-user-mail-address))
         (user-domain
-         (if (string-match "@\\(.*\\)\\'" user-mail)
+         (if (and user-mail
+                  (string-match "@\\(.*\\)\\'" user-mail))
              (match-string 1 user-mail))))
     (cond
      ((and message-user-fqdn