aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorSvante Signell2011-04-08 14:44:36 -0400
committerChong Yidong2011-04-08 14:44:36 -0400
commit0080dc6bd919f83c036bb6072800032b1723b248 (patch)
tree0b4355a65964fccac9344db4d1e1da758d458496 /src
parent7afdcb4571269bd1175fe8f5d3aac928ce942ec0 (diff)
downloademacs-0080dc6bd919f83c036bb6072800032b1723b248.tar.gz
emacs-0080dc6bd919f83c036bb6072800032b1723b248.zip
* term.c (init_tty): Fix incorrect ifdef placement (Bug#8450).
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog4
-rw-r--r--src/term.c3
2 files changed, 5 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 728b215b9ec..5e92b45b9d0 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
12011-04-08 Svante Signell <svante.signell@telia.com> (tiny change)
2
3 * term.c (init_tty): Fix incorrect ifdef placement (Bug#8450).
4
12011-03-19 Christoph Scholtes <cschol2112@googlemail.com> 52011-03-19 Christoph Scholtes <cschol2112@googlemail.com>
2 6
3 * process.c (Fformat_network_address): Doc fix. 7 * process.c (Fformat_network_address): Doc fix.
diff --git a/src/term.c b/src/term.c
index 6d16a65674b..44e127e7154 100644
--- a/src/term.c
+++ b/src/term.c
@@ -3413,13 +3413,12 @@ init_tty (char *name, char *terminal_type, int must_succeed)
3413 if we don't have one at the moment. */ 3413 if we don't have one at the moment. */
3414 fd = emacs_open (name, O_RDWR | O_IGNORE_CTTY | O_NOCTTY, 0); 3414 fd = emacs_open (name, O_RDWR | O_IGNORE_CTTY | O_NOCTTY, 0);
3415 else 3415 else
3416#else 3416#endif /* O_IGNORE_CTTY */
3417 /* Alas, O_IGNORE_CTTY is a GNU extension that seems to be only 3417 /* Alas, O_IGNORE_CTTY is a GNU extension that seems to be only
3418 defined on Hurd. On other systems, we need to explicitly 3418 defined on Hurd. On other systems, we need to explicitly
3419 dissociate ourselves from the controlling tty when we want to 3419 dissociate ourselves from the controlling tty when we want to
3420 open a frame on the same terminal. */ 3420 open a frame on the same terminal. */
3421 fd = emacs_open (name, O_RDWR | O_NOCTTY, 0); 3421 fd = emacs_open (name, O_RDWR | O_NOCTTY, 0);
3422#endif /* O_IGNORE_CTTY */
3423 3422
3424 tty->name = xstrdup (name); 3423 tty->name = xstrdup (name);
3425 terminal->name = xstrdup (name); 3424 terminal->name = xstrdup (name);