diff options
| author | Tom Tromey | 2013-06-03 12:25:05 -0600 |
|---|---|---|
| committer | Tom Tromey | 2013-06-03 12:25:05 -0600 |
| commit | 68359abba96d7ec4db8aab3d3dd9cf1105c3bab5 (patch) | |
| tree | 862703e7e1a1888170136a8296a5750d6b2ae2eb /src/term.c | |
| parent | cbcba8ce7f980b01c18c0fd561ef6687b1361507 (diff) | |
| parent | e2d8a6f0a229b4ebe26484b892ec4f14888f58b6 (diff) | |
| download | emacs-68359abba96d7ec4db8aab3d3dd9cf1105c3bab5.tar.gz emacs-68359abba96d7ec4db8aab3d3dd9cf1105c3bab5.zip | |
merge from trunk; clean up some issues
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 38706602a02..28b944c6436 100644 --- a/src/term.c +++ b/src/term.c | |||
| @@ -2909,7 +2909,7 @@ dissociate_if_controlling_tty (int fd) | |||
| 2909 | { | 2909 | { |
| 2910 | /* If tcgetpgrp succeeds, fd is the controlling terminal, | 2910 | /* If tcgetpgrp succeeds, fd is the controlling terminal, |
| 2911 | so dissociate it by invoking setsid. */ | 2911 | so dissociate it by invoking setsid. */ |
| 2912 | if (0 <= tcgetpgrp (fd) && setsid () < 0) | 2912 | if (tcgetpgrp (fd) >= 0 && setsid () < 0) |
| 2913 | { | 2913 | { |
| 2914 | #ifdef TIOCNOTTY | 2914 | #ifdef TIOCNOTTY |
| 2915 | /* setsid failed, presumably because Emacs is already a process | 2915 | /* setsid failed, presumably because Emacs is already a process |