Synch to No Gnus 200506270911.

[elisp/gnus.git-] / lisp / mm-url.el

diff --git a/lisp/mm-url.el b/lisp/mm-url.el
index 9ac92df..529def5 100644 (file)
--- a/lisp/mm-url.el
+++ b/lisp/mm-url.el
@@ -31,14 +31,16 @@
 
 (eval-when-compile (require 'cl))
 
-(require 'mm-util)
+(require 'nnheader) ;; for `mm-char-or-char-int-p'.
 (require 'gnus)
 
 (eval-and-compile
   (autoload 'exec-installed-p "path-util"))
 
 (eval-when-compile
-  (require 'timer))
+  (if (featurep 'xemacs)
+      (require 'timer-funcs)
+    (require 'timer)))
 
 (defgroup mm-url nil
   "A wrapper of url package and external url command for Gnus."
@@ -49,7 +51,7 @@
                                    (require 'url)
                                  (error nil)))
   "*If non-nil, use external grab program `mm-url-program'."
-  :version "21.4"
+  :version "22.1"
   :type 'boolean
   :group 'mm-url)
 
@@ -57,7 +59,7 @@
   '((wget "wget" "--user-agent=mm-url" "-q" "-O" "-")
     (w3m  "w3m" "-dump_source")
     (lynx "lynx" "-source")
-    (curl "curl")))
+    (curl "curl" "--silent")))
 
 (defcustom mm-url-program
   (cond
@@ -68,7 +70,7 @@
    (t "GET"))
   "The url grab program.
 Likely values are `wget', `w3m', `lynx' and `curl'."
-  :version "21.4"
+  :version "22.1"
   :type '(choice
          (symbol :tag "wget" wget)
          (symbol :tag "w3m" w3m)
@@ -79,7 +81,7 @@ Likely values are `wget', `w3m', `lynx' and `curl'."
 
 (defcustom mm-url-arguments nil
   "The arguments for `mm-url-program'."
-  :version "21.4"
+  :version "22.1"
   :type '(repeat string)
   :group 'mm-url)