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/mm-decode.el | |
| 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/mm-decode.el')
| -rw-r--r-- | lisp/gnus/mm-decode.el | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/lisp/gnus/mm-decode.el b/lisp/gnus/mm-decode.el index 725adcf559c..c4cbce4abaf 100644 --- a/lisp/gnus/mm-decode.el +++ b/lisp/gnus/mm-decode.el @@ -105,9 +105,7 @@ ,disposition ,description ,cache ,id)) (defcustom mm-text-html-renderer - (cond ((and (executable-find "w3m") - (executable-find "curl")) - 'gnus-article-html) + (cond ((executable-find "w3m") 'gnus-article-html) ((executable-find "links") 'links) ((executable-find "lynx") 'lynx) ((locate-library "w3") 'w3) |