projects
/
elisp
/
gnus.git-
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Synch to No Gnus 200507290604.
[elisp/gnus.git-]
/
lisp
/
mm-url.el
diff --git
a/lisp/mm-url.el
b/lisp/mm-url.el
index
405bc05
..
7505f9f
100644
(file)
--- a/
lisp/mm-url.el
+++ b/
lisp/mm-url.el
@@
-17,8
+17,8
@@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary:
;;; Commentary:
@@
-31,14
+31,16
@@
(eval-when-compile (require 'cl))
(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 '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."
(defgroup mm-url nil
"A wrapper of url package and external url command for Gnus."
@@
-49,6
+51,7
@@
(require 'url)
(error nil)))
"*If non-nil, use external grab program `mm-url-program'."
(require 'url)
(error nil)))
"*If non-nil, use external grab program `mm-url-program'."
+ :version "22.1"
:type 'boolean
:group 'mm-url)
:type 'boolean
:group 'mm-url)
@@
-56,7
+59,7
@@
'((wget "wget" "--user-agent=mm-url" "-q" "-O" "-")
(w3m "w3m" "-dump_source")
(lynx "lynx" "-source")
'((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
(defcustom mm-url-program
(cond
@@
-67,6
+70,7
@@
(t "GET"))
"The url grab program.
Likely values are `wget', `w3m', `lynx' and `curl'."
(t "GET"))
"The url grab program.
Likely values are `wget', `w3m', `lynx' and `curl'."
+ :version "22.1"
:type '(choice
(symbol :tag "wget" wget)
(symbol :tag "w3m" w3m)
:type '(choice
(symbol :tag "wget" wget)
(symbol :tag "w3m" w3m)
@@
-77,6
+81,7
@@
Likely values are `wget', `w3m', `lynx' and `curl'."
(defcustom mm-url-arguments nil
"The arguments for `mm-url-program'."
(defcustom mm-url-arguments nil
"The arguments for `mm-url-program'."
+ :version "22.1"
:type '(repeat string)
:group 'mm-url)
:type '(repeat string)
:group 'mm-url)