aboutsummaryrefslogtreecommitdiffstats
path: root/src/process.c
diff options
context:
space:
mode:
authorAndrea Corallo2020-03-29 12:31:24 +0100
committerAndrea Corallo2020-03-29 12:31:24 +0100
commit00ee320a620704ae12a1e2104c2d08bf8bbdf0c9 (patch)
tree498c59219b572c89e10f9521b54c98896cb52ca9 /src/process.c
parent530faee2752c7b316fa21f2ac4d1266d3e7a38e6 (diff)
parent76b3bd8cbb9a0a01941d9c1766c054960e4bfd97 (diff)
downloademacs-00ee320a620704ae12a1e2104c2d08bf8bbdf0c9.tar.gz
emacs-00ee320a620704ae12a1e2104c2d08bf8bbdf0c9.zip
Merge remote-tracking branch 'savannah/master' into HEAD
Diffstat (limited to 'src/process.c')
-rw-r--r--src/process.c12
1 files changed, 12 insertions, 0 deletions
diff --git a/src/process.c b/src/process.c
index e4e5e57aeee..07881d6c5d3 100644
--- a/src/process.c
+++ b/src/process.c
@@ -8200,6 +8200,17 @@ restore_nofile_limit (void)
8200#endif 8200#endif
8201} 8201}
8202 8202
8203int
8204open_channel_for_module (Lisp_Object process)
8205{
8206 CHECK_PROCESS (process);
8207 CHECK_TYPE (PIPECONN_P (process), Qpipe_process_p, process);
8208 int fd = dup (XPROCESS (process)->open_fd[SUBPROCESS_STDOUT]);
8209 if (fd == -1)
8210 report_file_error ("Cannot duplicate file descriptor", Qnil);
8211 return fd;
8212}
8213
8203 8214
8204/* This is not called "init_process" because that is the name of a 8215/* This is not called "init_process" because that is the name of a
8205 Mach system call, so it would cause problems on Darwin systems. */ 8216 Mach system call, so it would cause problems on Darwin systems. */
@@ -8446,6 +8457,7 @@ amounts of data in one go. */);
8446 DEFSYM (Qinterrupt_process_functions, "interrupt-process-functions"); 8457 DEFSYM (Qinterrupt_process_functions, "interrupt-process-functions");
8447 8458
8448 DEFSYM (Qnull, "null"); 8459 DEFSYM (Qnull, "null");
8460 DEFSYM (Qpipe_process_p, "pipe-process-p");
8449 8461
8450 defsubr (&Sprocessp); 8462 defsubr (&Sprocessp);
8451 defsubr (&Sget_process); 8463 defsubr (&Sget_process);