aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2009-06-19 03:06:40 +0000
committerGlenn Morris2009-06-19 03:06:40 +0000
commit6ec6d6f469928db58895fb38ea8d6aadfd5f5a60 (patch)
tree9f3638caf2b2cb4fcc05708e895bb3da808dbb27
parentef34da7f7e7daa8cea19af5e5032af01d2fdae0a (diff)
downloademacs-6ec6d6f469928db58895fb38ea8d6aadfd5f5a60.tar.gz
emacs-6ec6d6f469928db58895fb38ea8d6aadfd5f5a60.zip
(open-network-stream): Doc fix.
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/subr.el20
2 files changed, 14 insertions, 10 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 359150a9d76..6b91985ed3e 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
12009-06-19 Glenn Morris <rgm@gnu.org>
2
3 * subr.el (open-network-stream): Doc fix.
4
12009-06-19 Juanma Barranquero <lekktu@gmail.com> 52009-06-19 Juanma Barranquero <lekktu@gmail.com>
2 6
3 * international/fontset.el (setup-default-fontset): 7 * international/fontset.el (setup-default-fontset):
diff --git a/lisp/subr.el b/lisp/subr.el
index aa60ab7ca80..1d4abfb070c 100644
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -1687,16 +1687,16 @@ Signal an error if the program returns with a non-zero exit status."
1687Returns a subprocess-object to represent the connection. 1687Returns a subprocess-object to represent the connection.
1688Input and output work as for subprocesses; `delete-process' closes it. 1688Input and output work as for subprocesses; `delete-process' closes it.
1689 1689
1690Args are NAME BUFFER HOST SERVICE. 1690NAME is the name for process. It is modified if necessary to make it unique.
1691NAME is name for process. It is modified if necessary to make it unique. 1691BUFFER is the buffer (or buffer name) to associate with the
1692BUFFER is the buffer (or buffer name) to associate with the process. 1692 process. Process output goes at end of that buffer. BUFFER may
1693 Process output goes at end of that buffer, unless you specify 1693 be nil, meaning that this process is not associated with any buffer.
1694 an output stream or filter function to handle the output. 1694HOST is the name or IP address of the host to connect to.
1695 BUFFER may be also nil, meaning that this process is not associated 1695SERVICE is the name of the service desired, or an integer specifying
1696 with any buffer. 1696 a port number to connect to.
1697HOST is name of the host to connect to, or its IP address. 1697
1698SERVICE is name of the service desired, or an integer specifying 1698This is a wrapper around `make-network-process', and only offers a
1699 a port number to connect to." 1699subset of its functionality."
1700 (make-network-process :name name :buffer buffer 1700 (make-network-process :name name :buffer buffer
1701 :host host :service service))) 1701 :host host :service service)))
1702 1702