diff options
| author | Paul Eggert | 2013-05-31 17:54:34 -0700 |
|---|---|---|
| committer | Paul Eggert | 2013-05-31 17:54:34 -0700 |
| commit | da9aff1154d9bf612067f1f0cb05fb0ad865d3ce (patch) | |
| tree | dd5374476f733b029b273c52c734d79e631472fe /src | |
| parent | 5c20c8b704f59e35e82c408fa44d8f9504f329eb (diff) | |
| download | emacs-da9aff1154d9bf612067f1f0cb05fb0ad865d3ce.tar.gz emacs-da9aff1154d9bf612067f1f0cb05fb0ad865d3ce.zip | |
* process.c (handle_child_signal): Also use WCONTINUED.
This is so that list-processes doesn't mistakenly list the process
as stopped, when the process has actually been continued and is
now running.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 7 | ||||
| -rw-r--r-- | src/process.c | 3 |
2 files changed, 9 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 5069811f12b..a2d4a21e973 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,10 @@ | |||
| 1 | 2013-06-01 Paul Eggert <eggert@cs.ucla.edu> | ||
| 2 | |||
| 3 | * process.c (handle_child_signal): Also use WCONTINUED. | ||
| 4 | This is so that list-processes doesn't mistakenly list the process | ||
| 5 | as stopped, when the process has actually been continued and is | ||
| 6 | now running. | ||
| 7 | |||
| 1 | 2013-05-31 Paul Eggert <eggert@cs.ucla.edu> | 8 | 2013-05-31 Paul Eggert <eggert@cs.ucla.edu> |
| 2 | 9 | ||
| 3 | Don't let D-bus autolaunch mess up SIGCHLD handling (Bug#14474). | 10 | Don't let D-bus autolaunch mess up SIGCHLD handling (Bug#14474). |
diff --git a/src/process.c b/src/process.c index 46385fa096b..45e8afdd22c 100644 --- a/src/process.c +++ b/src/process.c | |||
| @@ -6159,7 +6159,8 @@ handle_child_signal (int sig) | |||
| 6159 | struct Lisp_Process *p = XPROCESS (proc); | 6159 | struct Lisp_Process *p = XPROCESS (proc); |
| 6160 | int status; | 6160 | int status; |
| 6161 | 6161 | ||
| 6162 | if (p->alive && child_status_changed (p->pid, &status, WUNTRACED)) | 6162 | if (p->alive |
| 6163 | && child_status_changed (p->pid, &status, WUNTRACED | WCONTINUED)) | ||
| 6163 | { | 6164 | { |
| 6164 | /* Change the status of the process that was found. */ | 6165 | /* Change the status of the process that was found. */ |
| 6165 | p->tick = ++process_tick; | 6166 | p->tick = ++process_tick; |