[Emacs-diffs] /srv/bzr/emacs/trunk r106183: * sysdep.c (init_sys_modes): Fix the check for the controlling terminal.

[Chong Yidong]

------------------------------------------------------------
revno: 106183
fixes bug(s): http://debbugs.gnu.org/6649
author: Enami Tsugutomo <address@hidden>
committer: Chong Yidong <address@hidden>
branch nick: trunk
timestamp: Tue 2011-10-25 12:27:47 +0800
message:
  * sysdep.c (init_sys_modes): Fix the check for the controlling terminal.
modified:
  src/ChangeLog
  src/sysdep.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2011-10-20 12:39:52 +0000
+++ b/src/ChangeLog     2011-10-25 04:27:47 +0000
@@ -1,3 +1,8 @@
+2011-10-25  Enami Tsugutomo  <address@hidden>
+
+       * sysdep.c (init_sys_modes): Fix the check for the controlling
+       terminal (Bug#6649).
+
 2011-10-20  Eli Zaretskii  <address@hidden>
 
        * dispextern.h (struct bidi_it): New member next_en_type.

=== modified file 'src/sysdep.c'
--- a/src/sysdep.c      2011-09-29 12:00:18 +0000
+++ b/src/sysdep.c      2011-10-25 04:27:47 +0000
@@ -854,6 +854,7 @@
 init_sys_modes (struct tty_display_info *tty_out)
 {
   struct emacs_tty tty;
+  Lisp_Object terminal;
 
   Vtty_erase_char = Qnil;
 
@@ -907,7 +908,9 @@
       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.