diff options
| author | Eli Zaretskii | 2012-11-17 20:00:16 +0200 |
|---|---|---|
| committer | Eli Zaretskii | 2012-11-17 20:00:16 +0200 |
| commit | cf2d22b874ca2df0072e32ee641e8efffe4abd6d (patch) | |
| tree | 1795142ec7861fc85c61adc90f03265b69041556 /src/term.c | |
| parent | 3c4ca7155293ffc2d04708007131bcbc882d8913 (diff) | |
| parent | 6ad30855c02908fdd99d9b11943719e185e65ee3 (diff) | |
| download | emacs-cf2d22b874ca2df0072e32ee641e8efffe4abd6d.tar.gz emacs-cf2d22b874ca2df0072e32ee641e8efffe4abd6d.zip | |
Merge from trunk.
Diffstat (limited to 'src/term.c')
| -rw-r--r-- | src/term.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/term.c b/src/term.c index 578c701858f..96549290da5 100644 --- a/src/term.c +++ b/src/term.c | |||
| @@ -2992,7 +2992,7 @@ init_tty (const char *name, const char *terminal_type, int must_succeed) | |||
| 2992 | int fd; | 2992 | int fd; |
| 2993 | FILE *file; | 2993 | FILE *file; |
| 2994 | 2994 | ||
| 2995 | #ifdef O_IGNORE_CTTY | 2995 | #if O_IGNORE_CTTY |
| 2996 | if (!ctty) | 2996 | if (!ctty) |
| 2997 | /* Open the terminal device. Don't recognize it as our | 2997 | /* Open the terminal device. Don't recognize it as our |
| 2998 | controlling terminal, and don't make it the controlling tty | 2998 | controlling terminal, and don't make it the controlling tty |
| @@ -3023,7 +3023,7 @@ init_tty (const char *name, const char *terminal_type, int must_succeed) | |||
| 3023 | name); | 3023 | name); |
| 3024 | } | 3024 | } |
| 3025 | 3025 | ||
| 3026 | #ifndef O_IGNORE_CTTY | 3026 | #if !O_IGNORE_CTTY |
| 3027 | if (!ctty) | 3027 | if (!ctty) |
| 3028 | dissociate_if_controlling_tty (fd); | 3028 | dissociate_if_controlling_tty (fd); |
| 3029 | #endif | 3029 | #endif |