diff options
| author | Glenn Morris <[email protected]> | 2008-08-30 02:22:47 +0000 |
|---|---|---|
| committer | Glenn Morris <[email protected]> | 2008-08-30 02:22:47 +0000 |
| commit | e77e9cf40975a5943b3c2bfdab6eca1c44eaa32f (patch) | |
| tree | 49aa9e98449b04301cda4cc680aed33d0c2194bd /lisp/url | |
| parent | 36bdf1ff3ca1e776bc4be74f10e20bfbdb8d617a (diff) | |
(url-https-expand-file-name): Resolve directly to url-default-expander
rather than via another alias.
(url-default-expander): Autoload an autoload. (Bug#825).
Diffstat (limited to 'lisp/url')
| -rw-r--r-- | lisp/url/ChangeLog | 6 | ||||
| -rw-r--r-- | lisp/url/url-http.el | 6 |
2 files changed, 10 insertions, 2 deletions
diff --git a/lisp/url/ChangeLog b/lisp/url/ChangeLog index 214c7a2bd2..bb70ab68ba 100644 --- a/lisp/url/ChangeLog +++ b/lisp/url/ChangeLog @@ -1,3 +1,9 @@ +2008-08-30 Glenn Morris <[email protected]> + + * 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 <[email protected]> * url.el (url-do-setup): diff --git a/lisp/url/url-http.el b/lisp/url/url-http.el index 0a3acff31a..fc26447d70 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 <[email protected]> ;; 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 |