diff options
| author | Dan Nicolaescu | 2010-08-05 15:20:09 -0700 |
|---|---|---|
| committer | Dan Nicolaescu | 2010-08-05 15:20:09 -0700 |
| commit | 6254cdda90d55b2f93ca238ad84e86a69f8f9c8e (patch) | |
| tree | 45c0b81b1292eae69f9d6fa4678be80809e57fe2 /src/term.c | |
| parent | 52eeb591d7f834f91cca406b52e6f6097c3b9c3f (diff) | |
| download | emacs-6254cdda90d55b2f93ca238ad84e86a69f8f9c8e.tar.gz emacs-6254cdda90d55b2f93ca238ad84e86a69f8f9c8e.zip | |
Fix emacs -Q -f server-start & emacsclient -t on GNU/Linux.
* src/term.c (dissociate_if_controlling_tty): Use USG5 instead of
USG. This is equivalent to defined (USG) && !defined (BSD_PGRPS),
which is what was there before BSD_PGRPS was removed.
Diffstat (limited to 'src/term.c')
| -rw-r--r-- | src/term.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/term.c b/src/term.c index 85f4f2b39dd..f41aacb2742 100644 --- a/src/term.c +++ b/src/term.c | |||
| @@ -3343,7 +3343,7 @@ dissociate_if_controlling_tty (int fd) | |||
| 3343 | EMACS_GET_TTY_PGRP (fd, &pgid); /* If tcgetpgrp succeeds, fd is the ctty. */ | 3343 | EMACS_GET_TTY_PGRP (fd, &pgid); /* If tcgetpgrp succeeds, fd is the ctty. */ |
| 3344 | if (pgid != -1) | 3344 | if (pgid != -1) |
| 3345 | { | 3345 | { |
| 3346 | #if defined (USG) | 3346 | #if defined (USG5) |
| 3347 | setpgrp (); | 3347 | setpgrp (); |
| 3348 | no_controlling_tty = 1; | 3348 | no_controlling_tty = 1; |
| 3349 | #elif defined (CYGWIN) | 3349 | #elif defined (CYGWIN) |