From f33095ed6b538acc5e2a5bed36f364ffb4bf81ca Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Sat, 22 Feb 2014 13:08:22 -0800 Subject: [PATCH] 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. --- doc/lispref/processes.texi | 5 ++--- etc/NEWS | 1 + src/ChangeLog | 5 +++++ 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. argument that specifies where the standard output from the program will go. It should be a buffer or a buffer name; if it is a buffer name, that will create the buffer if it does not already exist. It can also -be @code{nil}, which says to discard the output unless a custom filter function +be @code{nil}, which says to discard the output, unless a custom filter function handles it. (@xref{Filter Functions}, and @ref{Read and Print}.) Normally, you should avoid having multiple processes send output to the 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. By default, process output is inserted in the associated buffer. (You can change this by defining a custom filter function, -@pxref{Filter Functions}). The position to insert the output is +@pxref{Filter Functions}.) The position to insert the output is determined by the @code{process-mark}, which is then updated to point to the end of the text just inserted. Usually, but not always, the @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 @c set-process-filter-multibyte and process-filter-multibyte-p, @cindex filter multibyte flag, of process @cindex process filter multibyte flag -@c FIXME there is always a filter function now When Emacs calls a process filter function, it provides the process output as a multibyte string or as a unibyte string according to the process's filter coding system. Emacs diff --git a/etc/NEWS b/etc/NEWS index 59875727cac..3dd446dda62 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -1093,6 +1093,7 @@ errors. You should either convert them to utf-8 or add an explicit It used to disable the minor mode, major mode, and text-property keymaps, whereas now it simply has higher precedence. ++++ ** Default process filters and sentinels are not nil any more. Instead they default to a function that does what the nil value used to do. diff --git a/src/ChangeLog b/src/ChangeLog index 70fce9add14..9c5d5a1b865 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2014-02-22 Glenn Morris + + * process.c (Finternal_default_process_filter) + (Finternal_default_process_sentinel): Doc tweaks. + 2014-02-21 Glenn Morris * 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, DEFUN ("internal-default-process-filter", Finternal_default_process_filter, Sinternal_default_process_filter, 2, 2, 0, doc: /* Function used as default process filter. -This inserts the process's output into its buffer. */) +This inserts the process's output into its buffer, if there is one. +Otherwise it discards the output. */) (Lisp_Object proc, Lisp_Object text) { struct Lisp_Process *p; @@ -6413,7 +6414,7 @@ status_notify (struct Lisp_Process *deleting_process) DEFUN ("internal-default-process-sentinel", Finternal_default_process_sentinel, Sinternal_default_process_sentinel, 2, 2, 0, doc: /* Function used as default sentinel for processes. -This inserts a status message into the process's buffer. */) +This inserts a status message into the process's buffer, if there is one. */) (Lisp_Object proc, Lisp_Object msg) { Lisp_Object buffer, symbol; -- 2.39.2