diff options
| author | Stefan Kangas | 2022-12-26 06:30:21 +0100 |
|---|---|---|
| committer | Stefan Kangas | 2022-12-26 06:30:21 +0100 |
| commit | 419ca81809c2eda9c9f102b7da820a6eb9685cc8 (patch) | |
| tree | 4320cb1d05bb999ad2752a426d93aae991b31649 /src | |
| parent | 48db8b68a8eb5c12d5682f2eb31cadc53186f5d7 (diff) | |
| parent | 6c00d126e7fe1f6e42a0c9454c2ab4a29dcd5989 (diff) | |
| download | emacs-419ca81809c2eda9c9f102b7da820a6eb9685cc8.tar.gz emacs-419ca81809c2eda9c9f102b7da820a6eb9685cc8.zip | |
Merge from origin/emacs-29
6c00d126e7f Remove remaining mentions of 'eval-current-buffer'
1073e96170b ; * doc/lispref/text.texi (Database): Fix a typo. (Bug#6...
b1e68a33d89 Update to Org 9.6-61-g63e073f
dad73e4de19 ; Review and fix NEWS and related documentation
72786ae237e ; Restore ARGS argument in c-ts-mode--fontify-declarator
940ab2423ca ; Always consider :lisp-dir when locating main file of VC...
9ab98cd42aa Add heuristic to locate lisp code in source packages
dda011c78d1 ; * doc/lispref/parsing.texi (Tree-sitter major modes): F...
d62b634d8fc ; * src/process.c (Fprocess_running_child_p): Doc fix.
f6c5b3d635e ; * doc/lispref/parsing.texi: Add a reminder.
e6c49c0454e ; Fix byte-copmiler warning in c-ts-mode--fontify-declarator
4234033a47a ; * lisp/treesit.el: Add some comments.
79584a206b9 Further generalize treesit-defun functions
a819ca5a93c Generalize treesit-defun functions to "things"
e8b34109eeb Reorder optional arguments to 'package-vc-install'
b38e56d8a98 Handle missing dependencies for source packages
7bc7b6b4dd9 ; Partial revert of f3e7820b
2cec78254ea ; * nt/INSTALL.W64: Fix wording.
ecee3bd4209 ; Fix recent changes in treesit documentation
# Conflicts:
# etc/NEWS
Diffstat (limited to 'src')
| -rw-r--r-- | src/process.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/process.c b/src/process.c index 5144c5d6c92..cab8a1d5cf2 100644 --- a/src/process.c +++ b/src/process.c | |||
| @@ -6795,10 +6795,13 @@ emacs_get_tty_pgrp (struct Lisp_Process *p) | |||
| 6795 | 6795 | ||
| 6796 | DEFUN ("process-running-child-p", Fprocess_running_child_p, | 6796 | DEFUN ("process-running-child-p", Fprocess_running_child_p, |
| 6797 | Sprocess_running_child_p, 0, 1, 0, | 6797 | Sprocess_running_child_p, 0, 1, 0, |
| 6798 | doc: /* Return non-nil if PROCESS has given the terminal to a | 6798 | doc: /* Return non-nil if PROCESS has given control of its terminal to a child. |
| 6799 | child. If the operating system does not make it possible to find out, | 6799 | If the operating system does not make it possible to find out, return t. |
| 6800 | return t. If we can find out, return the numeric ID of the foreground | 6800 | If it's possible to find out, return the numeric ID of the foreground |
| 6801 | process group. */) | 6801 | process group if PROCESS did give control of its terminal to a |
| 6802 | child process, and return nil if it didn't. | ||
| 6803 | |||
| 6804 | PROCESS must be a real subprocess, not a connection. */) | ||
| 6802 | (Lisp_Object process) | 6805 | (Lisp_Object process) |
| 6803 | { | 6806 | { |
| 6804 | /* Initialize in case ioctl doesn't exist or gives an error, | 6807 | /* Initialize in case ioctl doesn't exist or gives an error, |