Merge from gnus--rel--5.10

Patches applied:

 * gnus--rel--5.10  (patch 171)

   - Update from CVS

2006-12-04  Jouni K. Sepp\e,Ad\e(Bnen  <jks@iki.fi>  (tiny change)

   * lisp/mm-url.el (mm-url-predefined-programs): Call curl with correct
   options.

Revision: emacs@sv.gnu.org/gnus--devo--0--patch-249

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 1a60710..79fb3a2 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2006-12-04  Jouni K. Sepp\e,Ad\e(Bnen  <jks@iki.fi>  (tiny change)
+
+       * mm-url.el (mm-url-predefined-programs): Call curl with correct
+       options.
+
 2006-12-01  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
        * spam-report.el (spam-report-url-ping-plain): Wait for output to avoid

diff --git a/lisp/mm-url.el b/lisp/mm-url.el
index c0e1f33..febd865 100644 (file)
--- a/lisp/mm-url.el
+++ b/lisp/mm-url.el
@@ -57,7 +57,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