diff options
| author | Alan Mackenzie | 2011-10-28 14:35:39 +0000 |
|---|---|---|
| committer | Alan Mackenzie | 2011-10-28 14:35:39 +0000 |
| commit | 93b5b3bdc8b734132c530acd6ffae1196c0865bc (patch) | |
| tree | da8ed72a56bfbf65d6f3cd9bdc3fa5d123dc4873 /src/sysdep.c | |
| parent | 020716e178cdae443a3630c4307023cb3fc4c350 (diff) | |
| parent | bc97a826f8ea89a269f6043be3148930f023e2b2 (diff) | |
| download | emacs-93b5b3bdc8b734132c530acd6ffae1196c0865bc.tar.gz emacs-93b5b3bdc8b734132c530acd6ffae1196c0865bc.zip | |
Boring merge from savannah.
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 b0d5a1abbe3..d666f8dbb79 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. |