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

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

2 files changed, 10 insertions, 2 deletions

diff --git a/lisp/url/ChangeLog b/lisp/url/ChangeLog
index 214c7a2bd28..bb70ab68ba8 100644
--- 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-07-02  Juanma Barranquero  <lekktu@gmail.com>
 
         * url.el (url-do-setup):
diff --git a/lisp/url/url-http.el b/lisp/url/url-http.el
index 0a3acff31a1..fc26447d704 100644
--- a/lisp/url/url-http.el
+++ b/lisp/url/url-http.el
@@ -1,6 +1,7 @@
 ;;; url-http.el --- HTTP retrieval routines
 
-;; Copyright (C) 1999, 2001, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+;; Copyright (C) 1999, 2001, 2004, 2005, 2006, 2007,
+;;   2008  Free Software Foundation, Inc.
 
 ;; Author: Bill Perry <wmperry@gnu.org>
 ;; Keywords: comm, data, processes
@@ -1361,8 +1362,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