diff options
| author | Glenn Morris | 2014-02-22 13:08:22 -0800 |
|---|---|---|
| committer | Glenn Morris | 2014-02-22 13:08:22 -0800 |
| commit | f33095ed6b538acc5e2a5bed36f364ffb4bf81ca (patch) | |
| tree | 117182cdff09cd4fd1c69db6b6c2d0f11a985811 | |
| parent | b7aa5ad686cb7f5a2c1e7b0a67d32b92d412c877 (diff) | |
| download | emacs-f33095ed6b538acc5e2a5bed36f364ffb4bf81ca.tar.gz emacs-f33095ed6b538acc5e2a5bed36f364ffb4bf81ca.zip | |
Bit more doc for process filter and sentinel changes
* src/process.c (Finternal_default_process_filter)
(Finternal_default_process_sentinel): Doc tweaks.
* doc/lispref/processes.texi: Typo fixes.
* etc/NEWS: Related markup.
| -rw-r--r-- | doc/lispref/processes.texi | 5 | ||||
| -rw-r--r-- | etc/NEWS | 1 | ||||
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/process.c | 5 |
4 files changed, 11 insertions, 5 deletions
diff --git a/doc/lispref/processes.texi b/doc/lispref/processes.texi index 43a3666415d..f149725b082 100644 --- a/doc/lispref/processes.texi +++ b/doc/lispref/processes.texi | |||
| @@ -112,7 +112,7 @@ described below. | |||
| 112 | argument that specifies where the standard output from the program will | 112 | argument that specifies where the standard output from the program will |
| 113 | go. It should be a buffer or a buffer name; if it is a buffer name, | 113 | go. It should be a buffer or a buffer name; if it is a buffer name, |
| 114 | that will create the buffer if it does not already exist. It can also | 114 | that will create the buffer if it does not already exist. It can also |
| 115 | be @code{nil}, which says to discard the output unless a custom filter function | 115 | be @code{nil}, which says to discard the output, unless a custom filter function |
| 116 | handles it. (@xref{Filter Functions}, and @ref{Read and Print}.) | 116 | handles it. (@xref{Filter Functions}, and @ref{Read and Print}.) |
| 117 | Normally, you should avoid having multiple processes send output to the | 117 | Normally, you should avoid having multiple processes send output to the |
| 118 | same buffer because their output would be intermixed randomly. | 118 | same buffer because their output would be intermixed randomly. |
| @@ -1189,7 +1189,7 @@ be sent to the process, but this is not built into Emacs Lisp. | |||
| 1189 | 1189 | ||
| 1190 | By default, process output is inserted in the associated buffer. | 1190 | By default, process output is inserted in the associated buffer. |
| 1191 | (You can change this by defining a custom filter function, | 1191 | (You can change this by defining a custom filter function, |
| 1192 | @pxref{Filter Functions}). The position to insert the output is | 1192 | @pxref{Filter Functions}.) The position to insert the output is |
| 1193 | determined by the @code{process-mark}, which is then updated to point | 1193 | determined by the @code{process-mark}, which is then updated to point |
| 1194 | to the end of the text just inserted. Usually, but not always, the | 1194 | to the end of the text just inserted. Usually, but not always, the |
| 1195 | @code{process-mark} is at the end of the buffer. | 1195 | @code{process-mark} is at the end of the buffer. |
| @@ -1453,7 +1453,6 @@ code conversion and the end of line conversion---that is, one like | |||
| 1453 | @c set-process-filter-multibyte and process-filter-multibyte-p, | 1453 | @c set-process-filter-multibyte and process-filter-multibyte-p, |
| 1454 | @cindex filter multibyte flag, of process | 1454 | @cindex filter multibyte flag, of process |
| 1455 | @cindex process filter multibyte flag | 1455 | @cindex process filter multibyte flag |
| 1456 | @c FIXME there is always a filter function now | ||
| 1457 | When Emacs calls a process filter function, it provides the process | 1456 | When Emacs calls a process filter function, it provides the process |
| 1458 | output as a multibyte string or as a unibyte string according to the | 1457 | output as a multibyte string or as a unibyte string according to the |
| 1459 | process's filter coding system. Emacs | 1458 | process's filter coding system. Emacs |
| @@ -1093,6 +1093,7 @@ errors. You should either convert them to utf-8 or add an explicit | |||
| 1093 | It used to disable the minor mode, major mode, and text-property keymaps, | 1093 | It used to disable the minor mode, major mode, and text-property keymaps, |
| 1094 | whereas now it simply has higher precedence. | 1094 | whereas now it simply has higher precedence. |
| 1095 | 1095 | ||
| 1096 | +++ | ||
| 1096 | ** Default process filters and sentinels are not nil any more. | 1097 | ** Default process filters and sentinels are not nil any more. |
| 1097 | Instead they default to a function that does what the nil value used to do. | 1098 | Instead they default to a function that does what the nil value used to do. |
| 1098 | 1099 | ||
diff --git a/src/ChangeLog b/src/ChangeLog index 70fce9add14..9c5d5a1b865 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2014-02-22 Glenn Morris <rgm@gnu.org> | ||
| 2 | |||
| 3 | * process.c (Finternal_default_process_filter) | ||
| 4 | (Finternal_default_process_sentinel): Doc tweaks. | ||
| 5 | |||
| 1 | 2014-02-21 Glenn Morris <rgm@gnu.org> | 6 | 2014-02-21 Glenn Morris <rgm@gnu.org> |
| 2 | 7 | ||
| 3 | * process.c (Fprocess_buffer, Faccept_process_output) | 8 | * process.c (Fprocess_buffer, Faccept_process_output) |
diff --git a/src/process.c b/src/process.c index c891962ecb2..187627dd85a 100644 --- a/src/process.c +++ b/src/process.c | |||
| @@ -5188,7 +5188,8 @@ read_and_dispose_of_process_output (struct Lisp_Process *p, char *chars, | |||
| 5188 | DEFUN ("internal-default-process-filter", Finternal_default_process_filter, | 5188 | DEFUN ("internal-default-process-filter", Finternal_default_process_filter, |
| 5189 | Sinternal_default_process_filter, 2, 2, 0, | 5189 | Sinternal_default_process_filter, 2, 2, 0, |
| 5190 | doc: /* Function used as default process filter. | 5190 | doc: /* Function used as default process filter. |
| 5191 | This inserts the process's output into its buffer. */) | 5191 | This inserts the process's output into its buffer, if there is one. |
| 5192 | Otherwise it discards the output. */) | ||
| 5192 | (Lisp_Object proc, Lisp_Object text) | 5193 | (Lisp_Object proc, Lisp_Object text) |
| 5193 | { | 5194 | { |
| 5194 | struct Lisp_Process *p; | 5195 | struct Lisp_Process *p; |
| @@ -6413,7 +6414,7 @@ status_notify (struct Lisp_Process *deleting_process) | |||
| 6413 | DEFUN ("internal-default-process-sentinel", Finternal_default_process_sentinel, | 6414 | DEFUN ("internal-default-process-sentinel", Finternal_default_process_sentinel, |
| 6414 | Sinternal_default_process_sentinel, 2, 2, 0, | 6415 | Sinternal_default_process_sentinel, 2, 2, 0, |
| 6415 | doc: /* Function used as default sentinel for processes. | 6416 | doc: /* Function used as default sentinel for processes. |
| 6416 | This inserts a status message into the process's buffer. */) | 6417 | This inserts a status message into the process's buffer, if there is one. */) |
| 6417 | (Lisp_Object proc, Lisp_Object msg) | 6418 | (Lisp_Object proc, Lisp_Object msg) |
| 6418 | { | 6419 | { |
| 6419 | Lisp_Object buffer, symbol; | 6420 | Lisp_Object buffer, symbol; |