diff options
| author | Miles Bader <miles@gnu.org> | 2006-12-04 14:07:03 +0000 |
|---|---|---|
| committer | Miles Bader <miles@gnu.org> | 2006-12-04 14:07:03 +0000 |
| commit | 3aa84d301f48bfc960d601197639acb805ebd50e (patch) | |
| tree | db4e3e8299e800e1e6d768158ea5df777ad20f14 | |
| parent | 2c9cf57ef5e0bcee3be394ad0beb664043addb42 (diff) | |
| download | emacs-3aa84d301f48bfc960d601197639acb805ebd50e.tar.gz emacs-3aa84d301f48bfc960d601197639acb805ebd50e.tar.bz2 emacs-3aa84d301f48bfc960d601197639acb805ebd50e.zip | |
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 <jks@iki.fi> (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
| -rw-r--r-- | lisp/gnus/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/gnus/mm-url.el | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index 787a5d58c6f..60d224fb0fa 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog @@ -1,3 +1,8 @@ +2006-12-04 Jouni K. Sepp,Ad(Bnen <jks@iki.fi> (tiny change) + + * mm-url.el (mm-url-predefined-programs): Call curl with correct + options. + 2006-11-30 Katsumi Yamaoka <yamaoka@jpl.org> * mml2015.el (mml2015-pgg-clear-verify): Replace encode-coding-string diff --git a/lisp/gnus/mm-url.el b/lisp/gnus/mm-url.el index 5e228f0af72..70584bdf50d 100644 --- a/lisp/gnus/mm-url.el +++ b/lisp/gnus/mm-url.el @@ -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 |