diff options
| author | Chong Yidong <cyd@stupidchicken.com> | 2011-04-02 19:41:03 -0400 |
|---|---|---|
| committer | Chong Yidong <cyd@stupidchicken.com> | 2011-04-02 19:41:03 -0400 |
| commit | da91b5f294f8ec77f48f1bbe27707a0d33d981e9 (patch) | |
| tree | 877f9242d950613bfa159fde2ecb9fc915d13ab2 /lisp/subr.el | |
| parent | 1d2e369d6cc534d812f5fc025fd9f1f52e7df710 (diff) | |
| download | emacs-da91b5f294f8ec77f48f1bbe27707a0d33d981e9.tar.gz | |
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/subr.el')
| -rw-r--r-- | lisp/subr.el | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/lisp/subr.el b/lisp/subr.el index e6e0c62e0b4..387d538b69d 100644 --- a/lisp/subr.el +++ b/lisp/subr.el @@ -1792,28 +1792,6 @@ Signal an error if the program returns with a non-zero exit status." (forward-line 1)) (nreverse lines))))) -;; open-network-stream is a wrapper around make-network-process. - -(when (featurep 'make-network-process) - (defun open-network-stream (name buffer host service) - "Open a TCP connection for a service to a host. -Returns a subprocess-object to represent the connection. -Input and output work as for subprocesses; `delete-process' closes it. - -NAME is the name for the process. It is modified if necessary to make - it unique. -BUFFER is the buffer (or buffer name) to associate with the - process. Process output goes at end of that buffer. BUFFER may - be nil, meaning that this process is not associated with any buffer. -HOST is the name or IP address of the host to connect to. -SERVICE is the name of the service desired, or an integer specifying - a port number to connect to. - -This is a wrapper around `make-network-process', and only offers a -subset of its functionality." - (make-network-process :name name :buffer buffer - :host host :service service))) - ;; compatibility (make-obsolete |