diff options
| author | Eli Zaretskii | 2013-04-05 16:10:57 +0300 |
|---|---|---|
| committer | Eli Zaretskii | 2013-04-05 16:10:57 +0300 |
| commit | eb1dd42a729ab1b9cdcd278767951679480cd4c3 (patch) | |
| tree | 7a9787eacf9fa495ad8f7caef59bb58a46fbe04a /src/process.c | |
| parent | 86e9346005b957ddadb73586c9641e68ea12a79d (diff) | |
| parent | 2a417372c4a06fe90c343bc59660268c7a5ac3e9 (diff) | |
| download | emacs-eb1dd42a729ab1b9cdcd278767951679480cd4c3.tar.gz emacs-eb1dd42a729ab1b9cdcd278767951679480cd4c3.zip | |
Merge from trunk.
Diffstat (limited to 'src/process.c')
| -rw-r--r-- | src/process.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/process.c b/src/process.c index 6a14a536707..911a30bc808 100644 --- a/src/process.c +++ b/src/process.c | |||
| @@ -4236,7 +4236,7 @@ wait_reading_process_output (intmax_t time_limit, int nsecs, int read_kbd, | |||
| 4236 | time_limit = 0; | 4236 | time_limit = 0; |
| 4237 | nsecs = -1; | 4237 | nsecs = -1; |
| 4238 | } | 4238 | } |
| 4239 | else if (time_limit > TYPE_MAXIMUM (time_t)) | 4239 | else if (TYPE_MAXIMUM (time_t) < time_limit) |
| 4240 | time_limit = TYPE_MAXIMUM (time_t); | 4240 | time_limit = TYPE_MAXIMUM (time_t); |
| 4241 | 4241 | ||
| 4242 | /* Since we may need to wait several times, | 4242 | /* Since we may need to wait several times, |