summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
authorChong Yidong <cyd@stupidchicken.com>2009-09-25 03:42:22 +0000
committerChong Yidong <cyd@stupidchicken.com>2009-09-25 03:42:22 +0000
commit21289c5dad0989097dde494c84d7a6177393344b (patch)
tree71cb5e6d7291154cfd6f2cf91df4a5a0d8e565cb /lisp
parent6892b117c92c3309af2697415e44acd8cdba9846 (diff)
downloademacs-21289c5dad0989097dde494c84d7a6177393344b.tar.gz
* comint.el (comint-exec, comint-run, make-comint): Doc
fixes (Bug#4542).
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/comint.el8
2 files changed, 10 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 58662b7e898..bbfdf59a5bf 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2009-09-25 Devon Sean McCullough <emacs-hacker@Jovi.Net>
+
+ * comint.el (comint-exec, comint-run, make-comint): Doc
+ fixes (Bug#4542).
+
2009-09-25 Glenn Morris <rgm@gnu.org>
* mail/rmailmm.el (rmail-mime): New custom group.
diff --git a/lisp/comint.el b/lisp/comint.el
index 36d7de5ec2f..cc04bd90209 100644
--- a/lisp/comint.el
+++ b/lisp/comint.el
@@ -686,7 +686,8 @@ PROGRAM should be either a string denoting an executable program to create
via `start-file-process', or a cons pair of the form (HOST . SERVICE) denoting
a TCP connection to be opened via `open-network-stream'. If there is already
a running process in that buffer, it is not restarted. Optional fourth arg
-STARTFILE is the name of a file to send the contents of to the process.
+STARTFILE is the name of a file, whose contents are sent to the
+process as its initial input.
If PROGRAM is a string, any more args are arguments to PROGRAM."
(or (fboundp 'start-file-process)
@@ -709,7 +710,8 @@ PROGRAM should be either a string denoting an executable program to create
via `start-file-process', or a cons pair of the form (HOST . SERVICE) denoting
a TCP connection to be opened via `open-network-stream'. If there is already
a running process in that buffer, it is not restarted. Optional third arg
-STARTFILE is the name of a file to send the contents of the process to.
+STARTFILE is the name of a file, whose contents are sent to the
+process as its initial input.
If PROGRAM is a string, any more args are arguments to PROGRAM."
(apply #'make-comint-in-buffer name nil program startfile switches))
@@ -728,7 +730,7 @@ See `make-comint' and `comint-exec'."
(defun comint-exec (buffer name command startfile switches)
"Start up a process named NAME in buffer BUFFER for Comint modes.
-Runs the given COMMAND with SWITCHES with output to STARTFILE.
+Runs the given COMMAND with SWITCHES, and initial input from STARTFILE.
Blasts any old process running in the buffer. Doesn't set the buffer mode.
You can use this to cheaply run a series of processes in the same Comint
buffer. The hook `comint-exec-hook' is run after each exec."