diff options
| author | Gnus developers <ding@gnus.org> | 2010-12-11 01:27:14 +0000 |
|---|---|---|
| committer | Katsumi Yamaoka <yamaoka@jpl.org> | 2010-12-11 01:27:14 +0000 |
| commit | 3b84b005023f866afe3ba2b1e4178f39363aacc4 (patch) | |
| tree | 5f6c008ed3078c40c694f5efaee5760278226b5b /lisp/gnus/gnus-gravatar.el | |
| parent | 2b7f50d8775c7236b947c2f3e78786c1e2002722 (diff) | |
| download | emacs-3b84b005023f866afe3ba2b1e4178f39363aacc4.tar.gz | |
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.
Diffstat (limited to 'lisp/gnus/gnus-gravatar.el')
| -rw-r--r-- | lisp/gnus/gnus-gravatar.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/gnus/gnus-gravatar.el b/lisp/gnus/gnus-gravatar.el index 27f65c04094..1bd64e9533f 100644 --- a/lisp/gnus/gnus-gravatar.el +++ b/lisp/gnus/gnus-gravatar.el @@ -65,7 +65,7 @@ If nil, default to `gravatar-size'." (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)))))) |