diff options
| author | Paul Eggert | 2011-10-25 16:01:16 -0700 |
|---|---|---|
| committer | Paul Eggert | 2011-10-25 16:01:16 -0700 |
| commit | f0ecbca80a004824d74ca9bc8b77cc94b2489b34 (patch) | |
| tree | 1bce01242894a7840910731adc5b76c99f8e6c89 /src/sysdep.c | |
| parent | a14e15687ce2e0a02e27bf85f70b3d9c7dfdf850 (diff) | |
| parent | 507ea2587e3b868468e83ff6bc8b3303c4097984 (diff) | |
| download | emacs-f0ecbca80a004824d74ca9bc8b77cc94b2489b34.tar.gz emacs-f0ecbca80a004824d74ca9bc8b77cc94b2489b34.zip | |
Merge from trunk.
Diffstat (limited to 'src/sysdep.c')
| -rw-r--r-- | src/sysdep.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/sysdep.c b/src/sysdep.c index d2ce5a8cc1b..efc627e80b7 100644 --- a/src/sysdep.c +++ b/src/sysdep.c | |||
| @@ -854,6 +854,7 @@ void | |||
| 854 | init_sys_modes (struct tty_display_info *tty_out) | 854 | init_sys_modes (struct tty_display_info *tty_out) |
| 855 | { | 855 | { |
| 856 | struct emacs_tty tty; | 856 | struct emacs_tty tty; |
| 857 | Lisp_Object terminal; | ||
| 857 | 858 | ||
| 858 | Vtty_erase_char = Qnil; | 859 | Vtty_erase_char = Qnil; |
| 859 | 860 | ||
| @@ -907,7 +908,9 @@ init_sys_modes (struct tty_display_info *tty_out) | |||
| 907 | tty.main.c_cflag &= ~PARENB;/* Don't check parity */ | 908 | tty.main.c_cflag &= ~PARENB;/* Don't check parity */ |
| 908 | } | 909 | } |
| 909 | #endif | 910 | #endif |
| 910 | if (tty_out->input == stdin) | 911 | |
| 912 | XSETTERMINAL(terminal, tty_out->terminal); | ||
| 913 | if (!NILP (Fcontrolling_tty_p (terminal))) | ||
| 911 | { | 914 | { |
| 912 | tty.main.c_cc[VINTR] = quit_char; /* C-g (usually) gives SIGINT */ | 915 | tty.main.c_cc[VINTR] = quit_char; /* C-g (usually) gives SIGINT */ |
| 913 | /* Set up C-g for both SIGQUIT and SIGINT. | 916 | /* Set up C-g for both SIGQUIT and SIGINT. |