]> git.eshelyaron.com Git - emacs.git/commit
Merge changes made in Gnus trunk.
authorLars Magne Ingebrigtsen <larsi@gnus.org>
Tue, 14 Sep 2010 23:14:44 +0000 (23:14 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Tue, 14 Sep 2010 23:14:44 +0000 (23:14 +0000)
commit01e80360d0b8390327ac30bbb37230970a7c1ddc
tree4e62078848ced825d97db8010c30af73351312d3
parent3b59c3511cb74d944730b8156bbfd3bd7d8aa69f
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.
lisp/ChangeLog
lisp/gnus/ChangeLog
lisp/gnus/gnus-html.el
lisp/gnus/mm-decode.el
lisp/net/imap.el