From ba87d38a5aa0bdf829c7143c7b6838de2089db06 Mon Sep 17 00:00:00 2001 From: ShengHuo ZHU Date: Tue, 5 Feb 2002 14:56:52 +0000 Subject: [PATCH] * mm-url.el (mm-url-load-url): Require w3-vars for old versions. --- lisp/ChangeLog | 2 ++ lisp/mm-url.el | 10 ++++++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 883c7e8a6..069a60a9c 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,7 @@ 2002-02-05 ShengHuo ZHU + * 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 f76b8dbbc..9c9d8c712 100644 --- 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 -- 2.25.1