aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJan Djärv2013-07-02 14:46:43 +0200
committerJan Djärv2013-07-02 14:46:43 +0200
commit2c41e781945c57d170b41205a4af3acefa5cc85c (patch)
tree40f7931d6c2fd39cead16d88ed78085c31e43dd0 /src
parenteaa610c3b428121b0d9abb7580016a0747aaaf72 (diff)
downloademacs-2c41e781945c57d170b41205a4af3acefa5cc85c.tar.gz
emacs-2c41e781945c57d170b41205a4af3acefa5cc85c.zip
* process.c (handle_child_signal): Call catch_child_signal if NS_IMPL_GNUSTEP.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog5
-rw-r--r--src/process.c5
2 files changed, 10 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 13a9162caab..d5907c64942 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
12013-07-02 Jan Djärv <jan.h.d@swipnet.se>
2
3 * process.c (handle_child_signal): Call catch_child_signal if
4 NS_IMPL_GNUSTEP.
5
12013-07-02 Paul Eggert <eggert@cs.ucla.edu> 62013-07-02 Paul Eggert <eggert@cs.ucla.edu>
2 7
3 Don't convert function pointers to void * and back. 8 Don't convert function pointers to void * and back.
diff --git a/src/process.c b/src/process.c
index 5fe07a9c4fa..9961697e671 100644
--- a/src/process.c
+++ b/src/process.c
@@ -6210,6 +6210,11 @@ handle_child_signal (int sig)
6210 } 6210 }
6211 6211
6212 lib_child_handler (sig); 6212 lib_child_handler (sig);
6213#ifdef NS_IMPL_GNUSTEP
6214 /* NSTask in GNUStep sets its child handler each time it is called.
6215 So we must re-set ours. */
6216 catch_child_signal();
6217#endif
6213} 6218}
6214 6219
6215static void 6220static void