# HG changeset patch # User Miles Bader # Date 1165241223 0 # Node ID ff55caf2e84243341480eacdb4e13b799c58d611 # Parent 04d6f978bba25f862d9c042bd0e5cbe65d617784 Merge from gnus--rel--5.10 Patches applied: * gnus--rel--5.10 (patch 171) - Update from CVS 2006-12-04 Jouni K. Sepp,Ad(Bnen (tiny change) * lisp/gnus/mm-url.el (mm-url-predefined-programs): Call curl with correct options. Revision: emacs@sv.gnu.org/emacs--devo--0--patch-540 diff -r 04d6f978bba2 -r ff55caf2e842 lisp/gnus/ChangeLog --- a/lisp/gnus/ChangeLog Mon Dec 04 12:40:56 2006 +0000 +++ b/lisp/gnus/ChangeLog Mon Dec 04 14:07:03 2006 +0000 @@ -1,3 +1,8 @@ +2006-12-04 Jouni K. Sepp,Ad(Bnen (tiny change) + + * mm-url.el (mm-url-predefined-programs): Call curl with correct + options. + 2006-11-30 Katsumi Yamaoka * mml2015.el (mml2015-pgg-clear-verify): Replace encode-coding-string diff -r 04d6f978bba2 -r ff55caf2e842 lisp/gnus/mm-url.el --- a/lisp/gnus/mm-url.el Mon Dec 04 12:40:56 2006 +0000 +++ b/lisp/gnus/mm-url.el Mon Dec 04 14:07:03 2006 +0000 @@ -64,7 +64,7 @@ '((wget "wget" "--user-agent=mm-url" "-q" "-O" "-") (w3m "w3m" "-dump_source") (lynx "lynx" "-source") - (curl "curl" "--silent" "--user-agent mm-url" "--location"))) + (curl "curl" "--silent" "--user-agent" "mm-url" "--location"))) (defcustom mm-url-program (cond