diff options
| author | Chong Yidong <cyd@stupidchicken.com> | 2011-04-08 14:53:26 -0400 |
|---|---|---|
| committer | Chong Yidong <cyd@stupidchicken.com> | 2011-04-08 14:53:26 -0400 |
| commit | 6b8bc570715801cb194dc4273370eab87628e8bf (patch) | |
| tree | 01e4531fd38069dffbfb0150a2a596ddd8de2bd2 /src/term.c | |
| parent | 3726838a9cca22d420036cd2462398f54318f5d5 (diff) | |
| parent | 0080dc6bd919f83c036bb6072800032b1723b248 (diff) | |
Merge changes from emacs-23 branch
Diffstat (limited to 'src/term.c')
| -rw-r--r-- | src/term.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/term.c b/src/term.c index 39c9592e28..9be9950d5e 100644 --- a/src/term.c +++ b/src/term.c @@ -3155,13 +3155,12 @@ init_tty (const char *name, const char *terminal_type, int must_succeed) if we don't have one at the moment. */ fd = emacs_open (name, O_RDWR | O_IGNORE_CTTY | O_NOCTTY, 0); else -#else +#endif /* O_IGNORE_CTTY */ /* Alas, O_IGNORE_CTTY is a GNU extension that seems to be only defined on Hurd. On other systems, we need to explicitly dissociate ourselves from the controlling tty when we want to open a frame on the same terminal. */ fd = emacs_open (name, O_RDWR | O_NOCTTY, 0); -#endif /* O_IGNORE_CTTY */ tty->name = xstrdup (name); terminal->name = xstrdup (name); |