* mm-url.el (mm-url-load-url): New function.

	(mm-url-insert-file-contents): Use it.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 82eee16..5b9d3ff 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2002-02-04  ShengHuo ZHU  <zsh@cs.rochester.edu>
 
+       * mm-url.el (mm-url-load-url): New function.
+       (mm-url-insert-file-contents): Use it.
+
        * gnus-msg.el (gnus-summary-mail-forward): Use gnus-article-charset.
 
        * message.el (message-forward-make-body): Correctly copy

diff --git a/lisp/mm-url.el b/lisp/mm-url.el
index 24d6652..f76b8db 100644 (file)
--- a/lisp/mm-url.el
+++ b/lisp/mm-url.el
@@ -34,8 +34,7 @@
 (require 'mm-util)
 
 (eval-and-compile
-  (autoload 'executable-find "executable")
-  (autoload 'url-insert-file-contents "url-handlers"))
+  (autoload 'executable-find "executable"))
 
 (defgroup mm-url nil
   "A wrapper of url package and external url command for Gnus."
@@ -43,7 +42,7 @@
 
 (defcustom mm-url-use-external (not
                                (condition-case nil
-                                   (require 'url-handlers)
+                                   (require 'url)
                                  (error nil)))
   "*If not-nil, use external grab program `mm-url-program'."
   :type 'boolean
@@ -76,6 +75,9 @@
   :type '(repeat string)
   :group 'mm-url)
 
+\f
+;;; Internal variables
+
 ;; Stolen from w3.
 (defvar mm-url-html-entities
   '(
@@ -249,12 +251,19 @@
   "A list of characters that are _NOT_ reserved in the URL spec.
 This is taken from RFC 2396.")
 
+(defun mm-url-load-url ()
+  "Load `url-insert-file-contents'."
+  (condition-case ()
+      (require 'url-handlers)
+    (error nil))
+  (require 'url))
+
 (defun mm-url-insert-file-contents (url)
   (if mm-url-use-external
       (if (string-match "^file:/+" url)
          (insert-file-contents (substring url (1- (match-end 0))))
        (mm-url-insert-file-contents-external url))
-    (require 'url-handlers)
+    (mm-url-load-url)
     (let ((name buffer-file-name))
       (prog1
          (url-insert-file-contents url)
@@ -347,7 +356,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."
-  (require 'url-handlers)
+  (mm-url-load-url)
   (let ((url-request-data (mm-url-encode-www-form-urlencoded pairs))
        (url-request-method "POST")
        (url-request-extra-headers
@@ -357,7 +366,7 @@ spaces.  Die Die Die."
   t)
 
 (defun mm-url-fetch-simple (url content)
-  (require 'url-handlers)
+  (mm-url-load-url)
   (let ((url-request-data content)
        (url-request-method "POST")
        (url-request-extra-headers