diff options
| author | Gnus developers <ding@gnus.org> | 2010-12-17 22:45:16 +0000 |
|---|---|---|
| committer | Katsumi Yamaoka <yamaoka@jpl.org> | 2010-12-17 22:45:16 +0000 |
| commit | 70041e9ae7072eac5eeff2b5e1a50d9eab6b39f7 (patch) | |
| tree | 44e4cfef0c6fd744f917684171cf57574690d37f /lisp/gnus/gnus-gravatar.el | |
| parent | 2e306b392b3d517bcbee818e2be1335fce012d48 (diff) | |
| download | emacs-70041e9ae7072eac5eeff2b5e1a50d9eab6b39f7.tar.gz | |
Merge changes made in Gnus trunk.
nnir.el (nnir-get-active): Ignore nnir-ignored-newsgroups if null.
gnus-sum.el (gnus-summary-refer-thread): Simplify code. Restore gnus-use-agent.
(gnus-get-newsgroup-headers): Avoid unwanted spaces at eol.
gravatar.el (gravatar-retrieve-synchronously): New function.
(gravatar-get-data): Make more robust.
gnus-util.el (gnus-rescale-image): Allow to resize images even if they are from file. Can also scale up.
nnimap.el (nnimap-retrieve-headers): Remove CRLF from the headers.
nnir.el (nnir-mode): Make sure 'gnus-registry-install is bound.
gnus-sum.el (gnus-get-newsgroup-headers): Revert the last change here, since it's up to the backends to do CRLF removal if their protocol has it.
gnus-group.el (gnus-group-delete-articles): New command.
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 1bd64e9533f..2b1143b3b7b 100644 --- a/lisp/gnus/gnus-gravatar.el +++ b/lisp/gnus/gnus-gravatar.el @@ -56,7 +56,7 @@ If nil, default to `gravatar-size'." (let* ((mail-extr-disable-voodoo t) (addresses (mail-extract-address-components (or (mail-fetch-field header) "") t)) - (gravatar-size gnus-gravatar-size) + (gravatar-size (or gnus-gravatar-size gravatar-size)) name) (dolist (address addresses) (when (and (setq name (car address)) |