projects
/
gnus
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
618e571
)
Revert experimental changes.
author
Lars Magne Ingebrigtsen
<larsi@gnus.org>
Wed, 23 Jan 2002 00:50:49 +0000
(
00:50
+0000)
committer
Lars Magne Ingebrigtsen
<larsi@gnus.org>
Wed, 23 Jan 2002 00:50:49 +0000
(
00:50
+0000)
lisp/mm-url.el
patch
|
blob
|
history
diff --git
a/lisp/mm-url.el
b/lisp/mm-url.el
index
5baa44d
..
89072f7
100644
(file)
--- a/
lisp/mm-url.el
+++ b/
lisp/mm-url.el
@@
-32,20
+32,19
@@
(eval-when-compile (require 'cl))
(require 'mm-util)
(eval-when-compile (require 'cl))
(require 'mm-util)
-;;(require 'url)
-(require 'w3)
(eval-and-compile
(autoload 'executable-find "executable")
(eval-and-compile
(autoload 'executable-find "executable")
- ;;(autoload 'url-insert-file-contents "url-handlers")
- (autoload 'url-insert-file-contents "url")
- )
+ (autoload 'url-insert-file-contents "url-handlers"))
(defgroup mm-url nil
"A wrapper of url package and external url command for Gnus."
:group 'gnus)
(defgroup mm-url nil
"A wrapper of url package and external url command for Gnus."
:group 'gnus)
-(defcustom mm-url-use-external nil
+(defcustom mm-url-use-external (not
+ (condition-case nil
+ (require 'url-handlers)
+ (error nil)))
"*If not-nil, use external grab program `mm-url-program'."
:type 'boolean
:group 'mm-url)
"*If not-nil, use external grab program `mm-url-program'."
:type 'boolean
:group 'mm-url)
@@
-252,7
+251,7
@@
This is taken from RFC 2396.")
(if (string-match "^file:/+" url)
(insert-file-contents (substring url (1- (match-end 0))))
(mm-url-insert-file-contents-external url))
(if (string-match "^file:/+" url)
(insert-file-contents (substring url (1- (match-end 0))))
(mm-url-insert-file-contents-external url))
-
;;
(require 'url-handlers)
+ (require 'url-handlers)
(let ((name buffer-file-name))
(prog1
(url-insert-file-contents url)
(let ((name buffer-file-name))
(prog1
(url-insert-file-contents url)
@@
-345,7
+344,7
@@
spaces. Die Die Die."
(defun mm-url-fetch-form (url pairs)
"Fetch a form from URL with PAIRS as the data using the POST method."
(defun mm-url-fetch-form (url pairs)
"Fetch a form from URL with PAIRS as the data using the POST method."
-
;;
(require 'url-handlers)
+ (require 'url-handlers)
(let ((url-request-data (mm-url-encode-www-form-urlencoded pairs))
(url-request-method "POST")
(url-request-extra-headers
(let ((url-request-data (mm-url-encode-www-form-urlencoded pairs))
(url-request-method "POST")
(url-request-extra-headers
@@
-355,7
+354,7
@@
spaces. Die Die Die."
t)
(defun mm-url-fetch-simple (url content)
t)
(defun mm-url-fetch-simple (url content)
-
;;
(require 'url-handlers)
+ (require 'url-handlers)
(let ((url-request-data content)
(url-request-method "POST")
(url-request-extra-headers
(let ((url-request-data content)
(url-request-method "POST")
(url-request-extra-headers