diff options
| author | Juanma Barranquero | 2004-05-08 16:11:42 +0000 |
|---|---|---|
| committer | Juanma Barranquero | 2004-05-08 16:11:42 +0000 |
| commit | f3d9532b1a8aeb902bf492661129a72d2a0004c1 (patch) | |
| tree | 6cbafcfd4538484c30e0dafcd10134262c66e3ee /src | |
| parent | 65396510c3ff5e5386560d586cb117f6a9d06c27 (diff) | |
| download | emacs-f3d9532b1a8aeb902bf492661129a72d2a0004c1.tar.gz emacs-f3d9532b1a8aeb902bf492661129a72d2a0004c1.zip | |
(Fwaiting_for_user_input_p, Fmake_network_process)
(Fset_process_query_on_exit_flag, Vprocess_adaptive_read_buffering):
Fix spelling of Emacs on docstring.
(Fset_process_coding_system, Fprocess_coding_system)
(Fset_process_filter_multibyte, Fprocess_filter_multibyte_p):
Make argument names match their use in docstring.
(Fprocess_id, Fprocess_query_on_exit_flag, Finterrupt_process):
Fix docstring.
Diffstat (limited to 'src')
| -rw-r--r-- | src/process.c | 66 |
1 files changed, 33 insertions, 33 deletions
diff --git a/src/process.c b/src/process.c index 0db0638f85d..237f202e2f2 100644 --- a/src/process.c +++ b/src/process.c | |||
| @@ -532,7 +532,7 @@ allocate_pty () | |||
| 532 | three failures in a row before deciding that we've reached the | 532 | three failures in a row before deciding that we've reached the |
| 533 | end of the ptys. */ | 533 | end of the ptys. */ |
| 534 | int failed_count = 0; | 534 | int failed_count = 0; |
| 535 | 535 | ||
| 536 | if (stat (pty_name, &stb) < 0) | 536 | if (stat (pty_name, &stb) < 0) |
| 537 | { | 537 | { |
| 538 | failed_count++; | 538 | failed_count++; |
| @@ -842,7 +842,7 @@ If PROCESS has not yet exited or died, return 0. */) | |||
| 842 | 842 | ||
| 843 | DEFUN ("process-id", Fprocess_id, Sprocess_id, 1, 1, 0, | 843 | DEFUN ("process-id", Fprocess_id, Sprocess_id, 1, 1, 0, |
| 844 | doc: /* Return the process id of PROCESS. | 844 | doc: /* Return the process id of PROCESS. |
| 845 | This is the pid of the Unix process which PROCESS uses or talks to. | 845 | This is the pid of the external process which PROCESS uses or talks to. |
| 846 | For a network connection, this value is nil. */) | 846 | For a network connection, this value is nil. */) |
| 847 | (process) | 847 | (process) |
| 848 | register Lisp_Object process; | 848 | register Lisp_Object process; |
| @@ -1081,7 +1081,7 @@ DEFUN ("set-process-query-on-exit-flag", | |||
| 1081 | Fset_process_query_on_exit_flag, Sset_process_query_on_exit_flag, | 1081 | Fset_process_query_on_exit_flag, Sset_process_query_on_exit_flag, |
| 1082 | 2, 2, 0, | 1082 | 2, 2, 0, |
| 1083 | doc: /* Specify if query is needed for PROCESS when Emacs is exited. | 1083 | doc: /* Specify if query is needed for PROCESS when Emacs is exited. |
| 1084 | If the second argument FLAG is non-nil, emacs will query the user before | 1084 | If the second argument FLAG is non-nil, Emacs will query the user before |
| 1085 | exiting if PROCESS is running. */) | 1085 | exiting if PROCESS is running. */) |
| 1086 | (process, flag) | 1086 | (process, flag) |
| 1087 | register Lisp_Object process, flag; | 1087 | register Lisp_Object process, flag; |
| @@ -1094,7 +1094,7 @@ exiting if PROCESS is running. */) | |||
| 1094 | DEFUN ("process-query-on-exit-flag", | 1094 | DEFUN ("process-query-on-exit-flag", |
| 1095 | Fprocess_query_on_exit_flag, Sprocess_query_on_exit_flag, | 1095 | Fprocess_query_on_exit_flag, Sprocess_query_on_exit_flag, |
| 1096 | 1, 1, 0, | 1096 | 1, 1, 0, |
| 1097 | doc: /* Return the current value of query on exit flag for PROCESS. */) | 1097 | doc: /* Return the current value of query-on-exit flag for PROCESS. */) |
| 1098 | (process) | 1098 | (process) |
| 1099 | register Lisp_Object process; | 1099 | register Lisp_Object process; |
| 1100 | { | 1100 | { |
| @@ -2608,7 +2608,7 @@ successful) or "failed" when the connect completes. Default is to use | |||
| 2608 | a blocking connect (i.e. wait) for stream type connections. | 2608 | a blocking connect (i.e. wait) for stream type connections. |
| 2609 | 2609 | ||
| 2610 | :noquery BOOL -- Query the user unless BOOL is non-nil, and process is | 2610 | :noquery BOOL -- Query the user unless BOOL is non-nil, and process is |
| 2611 | running when emacs is exited. | 2611 | running when Emacs is exited. |
| 2612 | 2612 | ||
| 2613 | :stop BOOL -- Start process in the `stopped' state if BOOL non-nil. | 2613 | :stop BOOL -- Start process in the `stopped' state if BOOL non-nil. |
| 2614 | In the stopped state, a server process does not accept new | 2614 | In the stopped state, a server process does not accept new |
| @@ -2954,7 +2954,7 @@ usage: (make-network-process &rest ARGS) */) | |||
| 2954 | struct hostent *host_info_ptr; | 2954 | struct hostent *host_info_ptr; |
| 2955 | 2955 | ||
| 2956 | /* gethostbyname may fail with TRY_AGAIN, but we don't honour that, | 2956 | /* gethostbyname may fail with TRY_AGAIN, but we don't honour that, |
| 2957 | as it may `hang' emacs for a very long time. */ | 2957 | as it may `hang' Emacs for a very long time. */ |
| 2958 | immediate_quit = 1; | 2958 | immediate_quit = 1; |
| 2959 | QUIT; | 2959 | QUIT; |
| 2960 | host_info_ptr = gethostbyname (SDATA (host)); | 2960 | host_info_ptr = gethostbyname (SDATA (host)); |
| @@ -3634,7 +3634,7 @@ deactivate_process (proc) | |||
| 3634 | p->read_output_skip = Qnil; | 3634 | p->read_output_skip = Qnil; |
| 3635 | } | 3635 | } |
| 3636 | #endif | 3636 | #endif |
| 3637 | 3637 | ||
| 3638 | if (inchannel >= 0) | 3638 | if (inchannel >= 0) |
| 3639 | { | 3639 | { |
| 3640 | /* Beware SIGCHLD hereabouts. */ | 3640 | /* Beware SIGCHLD hereabouts. */ |
| @@ -3964,7 +3964,7 @@ server_accept_connection (server, channel) | |||
| 3964 | 3964 | ||
| 3965 | /* This variable is different from waiting_for_input in keyboard.c. | 3965 | /* This variable is different from waiting_for_input in keyboard.c. |
| 3966 | It is used to communicate to a lisp process-filter/sentinel (via the | 3966 | It is used to communicate to a lisp process-filter/sentinel (via the |
| 3967 | function Fwaiting_for_user_input_p below) whether emacs was waiting | 3967 | function Fwaiting_for_user_input_p below) whether Emacs was waiting |
| 3968 | for user-input when that process-filter was called. | 3968 | for user-input when that process-filter was called. |
| 3969 | waiting_for_input cannot be used as that is by definition 0 when | 3969 | waiting_for_input cannot be used as that is by definition 0 when |
| 3970 | lisp code is being evalled. | 3970 | lisp code is being evalled. |
| @@ -5060,7 +5060,7 @@ read_process_output (proc, channel) | |||
| 5060 | 5060 | ||
| 5061 | DEFUN ("waiting-for-user-input-p", Fwaiting_for_user_input_p, Swaiting_for_user_input_p, | 5061 | DEFUN ("waiting-for-user-input-p", Fwaiting_for_user_input_p, Swaiting_for_user_input_p, |
| 5062 | 0, 0, 0, | 5062 | 0, 0, 0, |
| 5063 | doc: /* Returns non-nil if emacs is waiting for input from the user. | 5063 | doc: /* Returns non-nil if Emacs is waiting for input from the user. |
| 5064 | This is intended for use by asynchronous process output filters and sentinels. */) | 5064 | This is intended for use by asynchronous process output filters and sentinels. */) |
| 5065 | () | 5065 | () |
| 5066 | { | 5066 | { |
| @@ -5443,7 +5443,7 @@ emacs_get_tty_pgrp (p) | |||
| 5443 | { | 5443 | { |
| 5444 | int gid = -1; | 5444 | int gid = -1; |
| 5445 | 5445 | ||
| 5446 | #ifdef TIOCGPGRP | 5446 | #ifdef TIOCGPGRP |
| 5447 | if (ioctl (XINT (p->infd), TIOCGPGRP, &gid) == -1 && ! NILP (p->tty_name)) | 5447 | if (ioctl (XINT (p->infd), TIOCGPGRP, &gid) == -1 && ! NILP (p->tty_name)) |
| 5448 | { | 5448 | { |
| 5449 | int fd; | 5449 | int fd; |
| @@ -5640,7 +5640,7 @@ process_send_signal (process, signo, current_group, nomsg) | |||
| 5640 | we should just assume that p->pid is also the process group id. */ | 5640 | we should just assume that p->pid is also the process group id. */ |
| 5641 | 5641 | ||
| 5642 | gid = emacs_get_tty_pgrp (p); | 5642 | gid = emacs_get_tty_pgrp (p); |
| 5643 | 5643 | ||
| 5644 | if (gid == -1) | 5644 | if (gid == -1) |
| 5645 | /* If we can't get the information, assume | 5645 | /* If we can't get the information, assume |
| 5646 | the shell owns the tty. */ | 5646 | the shell owns the tty. */ |
| @@ -5723,7 +5723,7 @@ process_send_signal (process, signo, current_group, nomsg) | |||
| 5723 | DEFUN ("interrupt-process", Finterrupt_process, Sinterrupt_process, 0, 2, 0, | 5723 | DEFUN ("interrupt-process", Finterrupt_process, Sinterrupt_process, 0, 2, 0, |
| 5724 | doc: /* Interrupt process PROCESS. | 5724 | doc: /* Interrupt process PROCESS. |
| 5725 | PROCESS may be a process, a buffer, or the name of a process or buffer. | 5725 | PROCESS may be a process, a buffer, or the name of a process or buffer. |
| 5726 | nil or no arg means current buffer's process. | 5726 | No arg or nil means current buffer's process. |
| 5727 | Second arg CURRENT-GROUP non-nil means send signal to | 5727 | Second arg CURRENT-GROUP non-nil means send signal to |
| 5728 | the current process-group of the process's controlling terminal | 5728 | the current process-group of the process's controlling terminal |
| 5729 | rather than to the process's own process group. | 5729 | rather than to the process's own process group. |
| @@ -6468,13 +6468,13 @@ DEFUN ("set-process-coding-system", Fset_process_coding_system, | |||
| 6468 | doc: /* Set coding systems of PROCESS to DECODING and ENCODING. | 6468 | doc: /* Set coding systems of PROCESS to DECODING and ENCODING. |
| 6469 | DECODING will be used to decode subprocess output and ENCODING to | 6469 | DECODING will be used to decode subprocess output and ENCODING to |
| 6470 | encode subprocess input. */) | 6470 | encode subprocess input. */) |
| 6471 | (proc, decoding, encoding) | 6471 | (process, decoding, encoding) |
| 6472 | register Lisp_Object proc, decoding, encoding; | 6472 | register Lisp_Object process, decoding, encoding; |
| 6473 | { | 6473 | { |
| 6474 | register struct Lisp_Process *p; | 6474 | register struct Lisp_Process *p; |
| 6475 | 6475 | ||
| 6476 | CHECK_PROCESS (proc); | 6476 | CHECK_PROCESS (process); |
| 6477 | p = XPROCESS (proc); | 6477 | p = XPROCESS (process); |
| 6478 | if (XINT (p->infd) < 0) | 6478 | if (XINT (p->infd) < 0) |
| 6479 | error ("Input file descriptor of %s closed", SDATA (p->name)); | 6479 | error ("Input file descriptor of %s closed", SDATA (p->name)); |
| 6480 | if (XINT (p->outfd) < 0) | 6480 | if (XINT (p->outfd) < 0) |
| @@ -6484,7 +6484,7 @@ encode subprocess input. */) | |||
| 6484 | 6484 | ||
| 6485 | p->decode_coding_system = decoding; | 6485 | p->decode_coding_system = decoding; |
| 6486 | p->encode_coding_system = encoding; | 6486 | p->encode_coding_system = encoding; |
| 6487 | setup_process_coding_systems (proc); | 6487 | setup_process_coding_systems (process); |
| 6488 | 6488 | ||
| 6489 | return Qnil; | 6489 | return Qnil; |
| 6490 | } | 6490 | } |
| @@ -6492,12 +6492,12 @@ encode subprocess input. */) | |||
| 6492 | DEFUN ("process-coding-system", | 6492 | DEFUN ("process-coding-system", |
| 6493 | Fprocess_coding_system, Sprocess_coding_system, 1, 1, 0, | 6493 | Fprocess_coding_system, Sprocess_coding_system, 1, 1, 0, |
| 6494 | doc: /* Return a cons of coding systems for decoding and encoding of PROCESS. */) | 6494 | doc: /* Return a cons of coding systems for decoding and encoding of PROCESS. */) |
| 6495 | (proc) | 6495 | (process) |
| 6496 | register Lisp_Object proc; | 6496 | register Lisp_Object process; |
| 6497 | { | 6497 | { |
| 6498 | CHECK_PROCESS (proc); | 6498 | CHECK_PROCESS (process); |
| 6499 | return Fcons (XPROCESS (proc)->decode_coding_system, | 6499 | return Fcons (XPROCESS (process)->decode_coding_system, |
| 6500 | XPROCESS (proc)->encode_coding_system); | 6500 | XPROCESS (process)->encode_coding_system); |
| 6501 | } | 6501 | } |
| 6502 | 6502 | ||
| 6503 | DEFUN ("set-process-filter-multibyte", Fset_process_filter_multibyte, | 6503 | DEFUN ("set-process-filter-multibyte", Fset_process_filter_multibyte, |
| @@ -6507,15 +6507,15 @@ If FLAG is non-nil, the filter is given multibyte strings. | |||
| 6507 | If FLAG is nil, the filter is given unibyte strings. In this case, | 6507 | If FLAG is nil, the filter is given unibyte strings. In this case, |
| 6508 | all character code conversion except for end-of-line conversion is | 6508 | all character code conversion except for end-of-line conversion is |
| 6509 | suppressed. */) | 6509 | suppressed. */) |
| 6510 | (proc, flag) | 6510 | (process, flag) |
| 6511 | Lisp_Object proc, flag; | 6511 | Lisp_Object process, flag; |
| 6512 | { | 6512 | { |
| 6513 | register struct Lisp_Process *p; | 6513 | register struct Lisp_Process *p; |
| 6514 | 6514 | ||
| 6515 | CHECK_PROCESS (proc); | 6515 | CHECK_PROCESS (process); |
| 6516 | p = XPROCESS (proc); | 6516 | p = XPROCESS (process); |
| 6517 | p->filter_multibyte = flag; | 6517 | p->filter_multibyte = flag; |
| 6518 | setup_process_coding_systems (proc); | 6518 | setup_process_coding_systems (process); |
| 6519 | 6519 | ||
| 6520 | return Qnil; | 6520 | return Qnil; |
| 6521 | } | 6521 | } |
| @@ -6523,13 +6523,13 @@ suppressed. */) | |||
| 6523 | DEFUN ("process-filter-multibyte-p", Fprocess_filter_multibyte_p, | 6523 | DEFUN ("process-filter-multibyte-p", Fprocess_filter_multibyte_p, |
| 6524 | Sprocess_filter_multibyte_p, 1, 1, 0, | 6524 | Sprocess_filter_multibyte_p, 1, 1, 0, |
| 6525 | doc: /* Return t if a multibyte string is given to PROCESS's filter.*/) | 6525 | doc: /* Return t if a multibyte string is given to PROCESS's filter.*/) |
| 6526 | (proc) | 6526 | (process) |
| 6527 | Lisp_Object proc; | 6527 | Lisp_Object process; |
| 6528 | { | 6528 | { |
| 6529 | register struct Lisp_Process *p; | 6529 | register struct Lisp_Process *p; |
| 6530 | 6530 | ||
| 6531 | CHECK_PROCESS (proc); | 6531 | CHECK_PROCESS (process); |
| 6532 | p = XPROCESS (proc); | 6532 | p = XPROCESS (process); |
| 6533 | 6533 | ||
| 6534 | return (NILP (p->filter_multibyte) ? Qnil : Qt); | 6534 | return (NILP (p->filter_multibyte) ? Qnil : Qt); |
| 6535 | } | 6535 | } |
| @@ -6750,11 +6750,11 @@ The value takes effect when `start-process' is called. */); | |||
| 6750 | #ifdef ADAPTIVE_READ_BUFFERING | 6750 | #ifdef ADAPTIVE_READ_BUFFERING |
| 6751 | DEFVAR_LISP ("process-adaptive-read-buffering", &Vprocess_adaptive_read_buffering, | 6751 | DEFVAR_LISP ("process-adaptive-read-buffering", &Vprocess_adaptive_read_buffering, |
| 6752 | doc: /* If non-nil, improve receive buffering by delaying after short reads. | 6752 | doc: /* If non-nil, improve receive buffering by delaying after short reads. |
| 6753 | On some systems, when emacs reads the output from a subprocess, the output data | 6753 | On some systems, when Emacs reads the output from a subprocess, the output data |
| 6754 | is read in very small blocks, potentially resulting in very poor performance. | 6754 | is read in very small blocks, potentially resulting in very poor performance. |
| 6755 | This behaviour can be remedied to some extent by setting this variable to a | 6755 | This behaviour can be remedied to some extent by setting this variable to a |
| 6756 | non-nil value, as it will automatically delay reading from such processes, to | 6756 | non-nil value, as it will automatically delay reading from such processes, to |
| 6757 | allowing them to produce more output before emacs tries to read it. | 6757 | allowing them to produce more output before Emacs tries to read it. |
| 6758 | If the value is t, the delay is reset after each write to the process; any other | 6758 | If the value is t, the delay is reset after each write to the process; any other |
| 6759 | non-nil value means that the delay is not reset on write. | 6759 | non-nil value means that the delay is not reset on write. |
| 6760 | The variable takes effect when `start-process' is called. */); | 6760 | The variable takes effect when `start-process' is called. */); |