Don't bug out on addresses without @ signs.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f4ca111..f87f291 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2010-10-04  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+       * message.el (message-idna-to-ascii-rhs-1): Don't bug out on addresses
+       without @ signs.
+

 2010-10-04  Michael Welsh Duggan  <md5i@md5i.com>  (tiny change)
 
        * nnir.el (nnir-run-imap): Remove spurious space in search string.
 2010-10-04  Michael Welsh Duggan  <md5i@md5i.com>  (tiny change)
 
        * nnir.el (nnir-run-imap): Remove spurious space in search string.

diff --git a/lisp/message.el b/lisp/message.el
index 7c8c07e..860e70c 100644 (file)
--- a/lisp/message.el
+++ b/lisp/message.el
@@ -5780,7 +5780,9 @@ subscribed address (and not the additional To and Cc header contents)."
                (mapcar (lambda (rhs) (or (cadr (split-string rhs "@")) ""))
                        (mapcar 'downcase
                                (mapcar
                (mapcar (lambda (rhs) (or (cadr (split-string rhs "@")) ""))
                        (mapcar 'downcase
                                (mapcar

-                                'cadr
+                                (lambda (elem)
+                                  (or (cadr elem)
+                                      ""))

                                 (mail-extract-address-components field t))))))
        ;; Note that `rhs' will be "" if the address does not have
        ;; the domain part, i.e., if it is a local user's address.
                                 (mail-extract-address-components field t))))))
        ;; Note that `rhs' will be "" if the address does not have
        ;; the domain part, i.e., if it is a local user's address.