Mercurial > emacs
diff lisp/gnus/gnus-gravatar.el @ 111872:a264bb877bc7
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 | f97704487fb3 |
children | c92e0a5c96e9 |
line wrap: on
line diff
--- a/lisp/gnus/gnus-gravatar.el Fri Dec 10 23:42:17 2010 +0100 +++ b/lisp/gnus/gnus-gravatar.el Sat Dec 11 01:27:14 2010 +0000 @@ -65,7 +65,7 @@ (when (or force (not (and gnus-gravatar-too-ugly (or (string-match gnus-gravatar-too-ugly - (cadr address)) + (or (cadr address) "")) (and name (string-match gnus-gravatar-too-ugly name))))))