Merge from emacs-24; up to 2014-05-01T10:21:17Z!rgm@gnu.org

2 files changed, 12 insertions, 0 deletions

diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index 9d15f65480c..0475635e958 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,7 @@
+2014-04-30  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * processes.texi (Filter Functions, Sentinels): Advertise add-function.
+
 2014-04-29  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * windows.texi (Window Configurations, Window Configurations):
diff --git a/doc/lispref/processes.texi b/doc/lispref/processes.texi
index ad62b4fff63..c91afdffdeb 100644
--- a/doc/lispref/processes.texi
+++ b/doc/lispref/processes.texi
@@ -1364,6 +1364,10 @@ which inserts the process output into the process buffer.
 This function returns the filter function of @var{process}.
 @end defun
 
+In case the process's output needs to be passed to several filters, you can
+use @code{add-function} to combine an existing filter with a new one.
+@xref{Advising Functions}.
+
   Here is an example of the use of a filter function:
 
 @smallexample
@@ -1617,6 +1621,10 @@ sentinel, the eventual call to the sentinel will use the new one.
 This function returns the sentinel of @var{process}.
 @end defun
 
+In case a process status changes need to be passed to several sentinels, you
+can use @code{add-function} to combine an existing sentinel with a new one.
+@xref{Advising Functions}.
+
 @defun waiting-for-user-input-p
 While a sentinel or filter function is running, this function returns
 non-@code{nil} if Emacs was waiting for keyboard input from the user at