Mercurial > emacs
comparison 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 |
comparison
equal
deleted
inserted
replaced
| 111871:d21197a7fc63 | 111872:a264bb877bc7 |
|---|---|
| 63 (string-match "\\` +" name)) | 63 (string-match "\\` +" name)) |
| 64 (setcar address (setq name (substring name (match-end 0))))) | 64 (setcar address (setq name (substring name (match-end 0))))) |
| 65 (when (or force | 65 (when (or force |
| 66 (not (and gnus-gravatar-too-ugly | 66 (not (and gnus-gravatar-too-ugly |
| 67 (or (string-match gnus-gravatar-too-ugly | 67 (or (string-match gnus-gravatar-too-ugly |
| 68 (cadr address)) | 68 (or (cadr address) "")) |
| 69 (and name | 69 (and name |
| 70 (string-match gnus-gravatar-too-ugly | 70 (string-match gnus-gravatar-too-ugly |
| 71 name)))))) | 71 name)))))) |
| 72 (ignore-errors | 72 (ignore-errors |
| 73 (gravatar-retrieve | 73 (gravatar-retrieve |