(url-https-expand-file-name): Resolve directly to url-default-expander

rather than via another alias.
(url-default-expander): Autoload an autoload.  (Bug#825).

diff --git a/lisp/url/ChangeLog b/lisp/url/ChangeLog
index 8eeb9c895372ef2bb19bf14e8896b8841fa76bdf..ae12c685dcc30d00d5eac65f402fa79ed3c0deac 100644 (file)
--- a/lisp/url/ChangeLog
+++ b/lisp/url/ChangeLog
@@ -1,3 +1,9 @@
+2008-08-30  Glenn Morris  <rgm@gnu.org>
+
+       * url-http.el (url-https-expand-file-name): Resolve directly to
+       url-default-expander rather than via another alias.
+       (url-default-expander): Autoload an autoload.  (Bug#825).
+
 2008-04-04  Magnus Henoch  <mange@freemail.hu>
 
        * url-http.el (url-http-chunked-encoding-after-change-function):

diff --git a/lisp/url/url-http.el b/lisp/url/url-http.el
index 98060461f3d0fcc6a5896809d7404e7455327561..326d7fc35dbdffbfbea36483f7993805f0193cff 100644 (file)
--- a/lisp/url/url-http.el
+++ b/lisp/url/url-http.el
@@ -1361,8 +1361,9 @@ p3p
 (defconst url-https-default-port 443 "Default HTTPS port.")
 ;;;###autoload
 (defconst url-https-asynchronous-p t "HTTPS retrievals are asynchronous.")
+;;;###autoload (autoload 'url-default-expander "url-expand")
 ;;;###autoload
-(defalias 'url-https-expand-file-name 'url-http-expand-file-name)
+(defalias 'url-https-expand-file-name 'url-default-expander)
 
 (defmacro url-https-create-secure-wrapper (method args)
   `(defun ,(intern (format (if method "url-https-%s" "url-https") method)) ,args