diff options
author | Lars Magne Ingebrigtsen <larsi@gnus.org> | 2010-09-14 23:14:44 +0000 |
---|---|---|
committer | Katsumi Yamaoka <yamaoka@jpl.org> | 2010-09-14 23:14:44 +0000 |
commit | 01e80360d0b8390327ac30bbb37230970a7c1ddc (patch) | |
tree | 4e62078848ced825d97db8010c30af73351312d3 /lisp/gnus/ChangeLog | |
parent | 3b59c3511cb74d944730b8156bbfd3bd7d8aa69f (diff) | |
download | emacs-01e80360d0b8390327ac30bbb37230970a7c1ddc.tar.gz |
Merge changes made in Gnus trunk.
imap.el: Revert back to version cb950ed8ff3e0f40dac437a51b269166f9ffb60d, since some of the changes seem problematic.
Fix up the w3m/curl dependencies.
mm-decode.el (mm-text-html-renderer): Don't have gnus-article-html depend on curl, which isn't essential.
gnus-html.el (gnus-html-schedule-image-fetching, gnus-html-prefetch-images): Check for curl before using it.
Diffstat (limited to 'lisp/gnus/ChangeLog')
-rw-r--r-- | lisp/gnus/ChangeLog | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index 7bb141ccfc0..8e2309f43a8 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog @@ -1,3 +1,15 @@ +2010-09-14 Lars Magne Ingebrigtsen <larsi@gnus.org> + + * gnus-html.el (gnus-html-schedule-image-fetching) + (gnus-html-prefetch-images): Check for curl before using it. + + * mm-decode.el (mm-text-html-renderer): Don't have gnus-article-html + depend on curl, which isn't essential. + + * imap.el: Revert back to version + cb950ed8ff3e0f40dac437a51b269166f9ffb60d, since some of the changes + seem problematic. + 2010-09-14 Juanma Barranquero <lekktu@gmail.com> * gnus-registry.el (gnus-registry-install-shortcuts): |