diff options
| author | Chong Yidong <[email protected]> | 2011-04-02 19:41:03 -0400 |
|---|---|---|
| committer | Chong Yidong <[email protected]> | 2011-04-02 19:41:03 -0400 |
| commit | da91b5f294f8ec77f48f1bbe27707a0d33d981e9 (patch) | |
| tree | 877f9242d950613bfa159fde2ecb9fc915d13ab2 /lisp/emacs-lisp/package.el | |
| parent | 1d2e369d6cc534d812f5fc025fd9f1f52e7df710 (diff) | |
Merge open-protocol-stream into open-network-stream.
* lisp/subr.el (open-network-stream): Move to net/network-stream.el.
* lisp/gnus/proto-stream.el: Move to net/network-stream.el.
* lisp/net/network-stream.el: Move from gnus/proto-stream.el.
Change prefix to network-stream throughout.
(open-protocol-stream): Merge into open-network-stream, leaving
open-protocol-stream as an alias. Handle nil BUFFER args.
* lisp/gnus/nnimap.el (nnimap-open-connection-1): Pass explicit :end-of-command
parameter to open-protocol-stream.
* lisp/emacs-lisp/package.el (package--with-work-buffer): Recognize
https URLs.
* lisp/url/url-gw.el (url-open-stream): Use new open-network-stream
functionality to perform encryption.
Diffstat (limited to 'lisp/emacs-lisp/package.el')
| -rw-r--r-- | lisp/emacs-lisp/package.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el index 5dc2938fe0..6aecc3615f 100644 --- a/lisp/emacs-lisp/package.el +++ b/lisp/emacs-lisp/package.el @@ -652,7 +652,7 @@ FILE is the name of a file relative to that base location. This macro retrieves FILE from LOCATION into a temporary buffer, and evaluates BODY while that buffer is current. This work buffer is killed afterwards. Return the last value in BODY." - `(let* ((http (string-match "\\`http:" ,location)) + `(let* ((http (string-match "\\`https?:" ,location)) (buffer (if http (url-retrieve-synchronously (concat ,location ,file)) |