diff options
| author | Glenn Morris | 2014-04-29 08:12:36 -0700 |
|---|---|---|
| committer | Glenn Morris | 2014-04-29 08:12:36 -0700 |
| commit | 4a25c1cb1e1be8fa3ceea455b7f442cfb507eb39 (patch) | |
| tree | 00f19c7a0218eaa0bb1f675ceb879ef682bc1ed6 /src | |
| parent | 7ac903abc8cebd281b2ab263770e293c096bbfca (diff) | |
| download | emacs-4a25c1cb1e1be8fa3ceea455b7f442cfb507eb39.tar.gz emacs-4a25c1cb1e1be8fa3ceea455b7f442cfb507eb39.zip | |
* src/process.c (handle_child_signal): Handle systems without WCONTINUED
Fixes: debbugs:15110
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 8 | ||||
| -rw-r--r-- | src/process.c | 6 |
2 files changed, 11 insertions, 3 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 0c8fa7b31d7..af9270fb7a4 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,8 +1,12 @@ | |||
| 1 | 2014-04-29 Glenn Morris <rgm@gnu.org> | ||
| 2 | |||
| 3 | * process.c (handle_child_signal): | ||
| 4 | Handle systems without WCONTINUED. (Bug#15110, 17339) | ||
| 5 | |||
| 1 | 2014-04-23 Eli Zaretskii <eliz@gnu.org> | 6 | 2014-04-23 Eli Zaretskii <eliz@gnu.org> |
| 2 | 7 | ||
| 3 | * search.c (Fnewline_cache_check): Don't try to count newlines | 8 | * search.c (Fnewline_cache_check): Don't try to count newlines |
| 4 | outside the buffer's restriction, as find_newline doesn't support | 9 | outside the buffer's restriction, as find_newline doesn't support that. |
| 5 | that. | ||
| 6 | 10 | ||
| 7 | 2014-04-22 Paul Eggert <eggert@cs.ucla.edu> | 11 | 2014-04-22 Paul Eggert <eggert@cs.ucla.edu> |
| 8 | 12 | ||
diff --git a/src/process.c b/src/process.c index 2c66b9e976e..07b690e6ebd 100644 --- a/src/process.c +++ b/src/process.c | |||
| @@ -6225,7 +6225,11 @@ handle_child_signal (int sig) | |||
| 6225 | int status; | 6225 | int status; |
| 6226 | 6226 | ||
| 6227 | if (p->alive | 6227 | if (p->alive |
| 6228 | && child_status_changed (p->pid, &status, WUNTRACED | WCONTINUED)) | 6228 | #ifndef WCONTINUED |
| 6229 | && child_status_changed (p->pid, &status, WUNTRACED)) | ||
| 6230 | #else | ||
| 6231 | && child_status_changed (p->pid, &status, WUNTRACED | WCONTINUED)) | ||
| 6232 | #endif | ||
| 6229 | { | 6233 | { |
| 6230 | /* Change the status of the process that was found. */ | 6234 | /* Change the status of the process that was found. */ |
| 6231 | p->tick = ++process_tick; | 6235 | p->tick = ++process_tick; |