From: Martin Rudalics Date: Thu, 2 Oct 2008 08:04:54 +0000 (+0000) Subject: (Faccept_process_output): Fix doc-string. X-Git-Tag: emacs-pretest-23.0.90~2686 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=2a7bb8823c0e36e9d093134bf49e2d9914641046;p=emacs.git (Faccept_process_output): Fix doc-string. --- diff --git a/src/ChangeLog b/src/ChangeLog index c4adaab887f..c7e4a9f87fb 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2008-10-02 Martin Rudalics + + * process.c (Faccept_process_output): Fix doc-string. + 2008-10-02 Dan Nicolaescu * gmalloc.c (__sbrk): Also define for uClibc. diff --git a/src/process.c b/src/process.c index fd19fc9288d..647025e055f 100644 --- a/src/process.c +++ b/src/process.c @@ -1221,7 +1221,7 @@ a socket connection. */) return XPROCESS (process)->type; } #endif - + DEFUN ("process-type", Fprocess_type, Sprocess_type, 1, 1, 0, doc: /* Return the connection type of PROCESS. The value is either the symbol `real', `network', or `serial'. @@ -4137,9 +4137,9 @@ It is read into the process' buffers or given to their filter functions. Non-nil arg PROCESS means do not return until some output has been received from PROCESS. -Non-nil second arg SECONDS and third arg MILLISEC are number of -seconds and milliseconds to wait; return after that much time whether -or not there is input. If SECONDS is a floating point number, +Non-nil second arg SECONDS and third arg MILLISEC are number of seconds +and milliseconds to wait; return after that much time whether or not +there is any subprocess output. If SECONDS is a floating point number, it specifies a fractional number of seconds to wait. The MILLISEC argument is obsolete and should be avoided. @@ -7136,7 +7136,7 @@ static void get_up_time (time_t *sec, unsigned *usec) { FILE *fup; - + *sec = *usec = 0; BLOCK_INPUT;