diff options
| author | Eli Zaretskii | 2024-05-04 13:12:21 +0300 |
|---|---|---|
| committer | Eli Zaretskii | 2024-05-04 13:12:21 +0300 |
| commit | fa0f65aa342e181e0e98f55cbf5d9a9be5ed3be6 (patch) | |
| tree | f4f143f00f32a1cfb141aef2279b1bafdcdc9b5d /src/process.c | |
| parent | 1121f17d7c4bc3b71edcd0799b894f50aa3a715e (diff) | |
| download | emacs-fa0f65aa342e181e0e98f55cbf5d9a9be5ed3be6.tar.gz emacs-fa0f65aa342e181e0e98f55cbf5d9a9be5ed3be6.zip | |
Fix implementation of the --terminal command-line switch
It sounds like this has been broken ever since multi-tty was
added to Emacs.
* src/keyboard.c (dev_tty): New global variable.
* src/keyboard.h: Declare 'dev_tty'.
* src/emacs.c (main): Initialize 'dev_tty'.
* src/term.c (Fcontrolling_tty_p, Fresume_tty, init_tty):
* src/process.c (dissociate_controlling_tty):
* src/keyboard.c (handle_interrupt_signal, handle_interrupt)
(Fset_quit_char): Use 'dev_tty' instead of 'DEV_TTY'. (Bug#70519)
Diffstat (limited to 'src/process.c')
| -rw-r--r-- | src/process.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/process.c b/src/process.c index 6b8b483cdf7..50d1968200d 100644 --- a/src/process.c +++ b/src/process.c | |||
| @@ -2114,7 +2114,7 @@ dissociate_controlling_tty (void) | |||
| 2114 | child that has not execed. | 2114 | child that has not execed. |
| 2115 | I wonder: would just ioctl (fd, TIOCNOTTY, 0) work here, for | 2115 | I wonder: would just ioctl (fd, TIOCNOTTY, 0) work here, for |
| 2116 | some fd that the caller already has? */ | 2116 | some fd that the caller already has? */ |
| 2117 | int ttyfd = emacs_open (DEV_TTY, O_RDWR, 0); | 2117 | int ttyfd = emacs_open (dev_tty, O_RDWR, 0); |
| 2118 | if (0 <= ttyfd) | 2118 | if (0 <= ttyfd) |
| 2119 | { | 2119 | { |
| 2120 | ioctl (ttyfd, TIOCNOTTY, 0); | 2120 | ioctl (ttyfd, TIOCNOTTY, 0); |