(url-retrieve-synchronously): Don't autoload.

2 files changed, 9 insertions, 2 deletions

diff --git a/lisp/url/ChangeLog b/lisp/url/ChangeLog
index ac6afe45608..cc2d1eace59 100644
--- a/lisp/url/ChangeLog
+++ b/lisp/url/ChangeLog
@@ -1,3 +1,11 @@
+2006-01-02  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * url-handlers.el (url-retrieve-synchronously): Don't autoload.
+
+        * url.el (url-retrieve, url-retrieve-synchronously): Autoload.
+
+        * url-cache.el: Require `url'.
+
 2005-12-27  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * url-cache.el (url-store-in-cache): Use save-current-buffer.
diff --git a/lisp/url/url-handlers.el b/lisp/url/url-handlers.el
index 1c9d1d9c0b1..0338eefd268 100644
--- a/lisp/url/url-handlers.el
+++ b/lisp/url/url-handlers.el
@@ -1,7 +1,7 @@
 ;;; url-handlers.el --- file-name-handler stuff for URL loading
 
 ;; Copyright (C) 1996, 1997, 1998, 1999, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006  Free Software Foundation, Inc.
 
 ;; Keywords: comm, data, processes, hypermedia
 
@@ -37,7 +37,6 @@
 ;;   after mm-dissect-buffer and defined in the same file.
 ;; The following are autoloaded instead of `require'd to avoid eagerly
 ;; loading all of URL when turning on url-handler-mode in the .emacs.
-(autoload 'url-retrieve-synchronously "url" "Retrieve url synchronously.")
 (autoload 'url-expand-file-name "url-expand" "Convert url to a fully specified url, and canonicalize it.")
 (autoload 'mm-dissect-buffer "mm-decode" "Dissect the current buffer and return a list of MIME handles.")
 (autoload 'url-scheme-get-property "url-methods" "Get property of a URL SCHEME.")