* sysdep.c (init_sys_modes): Fix the check for the controlling terminal.

Fixes: debbugs:6649
This commit is contained in:
Enami Tsugutomo 2011-10-25 12:27:47 +08:00 committed by Chong Yidong
parent df6d30f325
commit e112cc3727
2 changed files with 9 additions and 1 deletions

View file

@ -1,3 +1,8 @@
2011-10-25 Enami Tsugutomo <tsugutomo.enami@jp.sony.com>
* sysdep.c (init_sys_modes): Fix the check for the controlling
terminal (Bug#6649).
2011-10-20 Eli Zaretskii <eliz@gnu.org>
* dispextern.h (struct bidi_it): New member next_en_type.

View file

@ -854,6 +854,7 @@ void
init_sys_modes (struct tty_display_info *tty_out)
{
struct emacs_tty tty;
Lisp_Object terminal;
Vtty_erase_char = Qnil;
@ -907,7 +908,9 @@ init_sys_modes (struct tty_display_info *tty_out)
tty.main.c_cflag &= ~PARENB;/* Don't check parity */
}
#endif
if (tty_out->input == stdin)
XSETTERMINAL(terminal, tty_out->terminal);
if (!NILP (Fcontrolling_tty_p (terminal)))
{
tty.main.c_cc[VINTR] = quit_char; /* C-g (usually) gives SIGINT */
/* Set up C-g for both SIGQUIT and SIGINT.