* mm-url.el (mm-url-load-url): Require w3-vars for old versions.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 883c7e8..069a60a 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
 2002-02-05  ShengHuo ZHU  <zsh@cs.rochester.edu>
 
+       * mm-url.el (mm-url-load-url): Require w3-vars for old versions.
+
        * nntp.el (nntp-send-command-and-decode): Check PROCESS.
        * nntp.el (nntp-send-command): Ditto.
        * nntp.el (nntp-send-command-nodelete): Ditto.

diff --git a/lisp/mm-url.el b/lisp/mm-url.el
index f76b8db..9c9d8c7 100644 (file)
--- a/lisp/mm-url.el
+++ b/lisp/mm-url.el
@@ -253,10 +253,12 @@ 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))
+  (unless (condition-case ()
+             (require 'url-handlers)
+           (error nil))
+    ;; w3-4.0pre0.46 or earlier version.
+    (require 'w3-vars)
+    (require 'url)))
 
 (defun mm-url-insert-file-contents (url)
   (if mm-url-use-external