Mercurial > emacs

diff lisp/gnus/message.el @ 111872:a264bb877bc7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge changes made in Gnus trunk. nnir.el (nnir-request-expire-articles): Only allow article deletion. message.el (message-bogus-recipient-p): Set address to "" if nil. gnus-gravatar.el (gnus-gravatar-transform-address): Fix error when email address is nil. proto-stream.el (proto-stream-open-network-only): New function to have a way to specify non-STARTTLS upgrade connections.
author Katsumi Yamaoka <yamaoka@jpl.org>
date Sat, 11 Dec 2010 01:27:14 +0000
parents 25e3c2636c1f
children 6c6130ccdefd
line wrap: on
line diff
--- a/lisp/gnus/message.el	Fri Dec 10 23:42:17 2010 +0100
+++ b/lisp/gnus/message.el	Sat Dec 11 01:27:14 2010 +0000
@@ -4261,9 +4261,10 @@
   ;; FIXME: How about "foo@subdomain", when the MTA adds ".domain.tld"?
   (let (found)
     (mapc (lambda (address)
-	    (setq address (cadr address))
+	    (setq address (or (cadr address) ""))
 	    (when
-		(or (not
+		(or (string= "" address)
+                    (not
 		     (or
 		      (not (string-match "@" address))
 		      (string-match
@@ -4277,7 +4278,7 @@
 					       "\\|")
 				  message-bogus-addresses)))
 			   (string-match re address))))
-			 (push address found)))
+              (push address found)))
 	  ;;
 	  (mail-extract-address-components recipients t))
     found))