diff options
| author | Lars Magne Ingebrigtsen <[email protected]> | 2010-09-19 10:45:51 +0000 |
|---|---|---|
| committer | Katsumi Yamaoka <[email protected]> | 2010-09-19 10:45:51 +0000 |
| commit | e8861cd2e44567ee08ffe0933e961eda16918c59 (patch) | |
| tree | 86ef54f207471ea471ba92b0d5d1af495227b6ec /lisp/gnus/gnus-html.el | |
| parent | e2c3f530ff6fff5f5276ebc4db1e93a967eca351 (diff) | |
Merge changes made in Gnus trunk.
nnimap.el (nnimap-finish-retrieve-group-infos): Return data in the nntp buffer so the agent can save it.
nnimap.el (nnimap-open-shell-stream): Bind `process-connection-type' to nil, so that CRLF doesn't get translated to \n; (nnimap-open-connection): Don't make 'shell commands only send \n.
nnimap.el (nnimap-request-group): Don't make `M-g' bug out on group with no marks.
gnus-agent.el (gnus-agent-load-alist): Nix out the alist if the file doesn't exist.
nnimap.el (nnimap-finish-retrieve-group-infos): Protect against groups that have no articles.
nnimap.el (nnimap-request-article): Check that we really got an article when we requested one.
gnus-html.el (gnus-html-schedule-image-fetching): Ignore all errors from url-retrieve, for instance about invalid URLs.
gnus-agent.el: Change default of gnus-agent-auto-agentize-methods to nil.
Diffstat (limited to 'lisp/gnus/gnus-html.el')
| -rw-r--r-- | lisp/gnus/gnus-html.el | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/lisp/gnus/gnus-html.el b/lisp/gnus/gnus-html.el index b2ecb5cdf6..d3e8c48f44 100644 --- a/lisp/gnus/gnus-html.el +++ b/lisp/gnus/gnus-html.el @@ -298,9 +298,10 @@ fit these criteria." (gnus-message 8 "gnus-html-schedule-image-fetching: buffer %s, images %s" buffer images) (dolist (image images) - (url-retrieve (car image) - 'gnus-html-image-fetched - (list buffer image)))) + (ignore-errors + (url-retrieve (car image) + 'gnus-html-image-fetched + (list buffer image))))) (defun gnus-html-image-id (url) (expand-file-name (sha1 url) gnus-html-cache-directory)) |