Mercurial > emacs
changeset 83539:4a2f192917db
Fix various aborts in get_named_tty. (Patch by Kalle Olavi Niemitalo)
* src/keyboard.c (interrupt_signal, handle_interrupt, Fset_quit_char):
Fix get_named_tty calls for the controlling tty.
(Patch by Kalle Olavi Niemitalo <kon@iki.fi>)
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-579
| author | Karoly Lorentey <lorentey@elte.hu> |
|---|---|
| date | Sat, 29 Jul 2006 22:04:29 +0000 |
| parents | 5a2272b3d2b7 |
| children | 0c89a85addc3 |
| files | src/keyboard.c |
| diffstat | 1 files changed, 5 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/src/keyboard.c Sat Jul 29 21:30:46 2006 +0000 +++ b/src/keyboard.c Sat Jul 29 22:04:29 2006 +0000 @@ -10574,7 +10574,7 @@ SIGNAL_THREAD_CHECK (signalnum); /* See if we have an active terminal on our controlling tty. */ - terminal = get_named_tty (NULL); + terminal = get_named_tty ("/dev/tty"); if (!terminal) { /* If there are no frames there, let's pretend that we are a @@ -10618,7 +10618,7 @@ /* XXX This code needs to be revised for multi-tty support. */ if (!NILP (Vquit_flag) #ifndef MSDOS - && get_named_tty (NULL) + && get_named_tty ("/dev/tty") #endif ) { @@ -10915,14 +10915,14 @@ doc: /* Specify character used for quitting. QUIT must be an ASCII character. -This function only has an effect on the terminal on the controlling -tty of the Emacs process. +This function only has an effect on the controlling tty of the Emacs +process. See also `current-input-mode'. */) (quit) Lisp_Object quit; { - struct terminal *t = get_named_tty (NULL); + struct terminal *t = get_named_tty ("/dev/tty"); struct tty_display_info *tty; if (t == NULL || t->type != output_termcap) return Qnil;