diff options
| author | Ken Brown | 2012-05-24 07:21:34 -0400 |
|---|---|---|
| committer | Ken Brown | 2012-05-24 07:21:34 -0400 |
| commit | 2f9b9adb4652f52c12b6388b1fd3d03fa4f99b32 (patch) | |
| tree | e6a9a90d3d69024722d6b644d0c27b008548fb34 /src | |
| parent | 52c55cc7d2bec9795533f58e15c61f7a7b51d1b0 (diff) | |
| download | emacs-2f9b9adb4652f52c12b6388b1fd3d03fa4f99b32.tar.gz emacs-2f9b9adb4652f52c12b6388b1fd3d03fa4f99b32.zip | |
* src/callproc.c (Fcall_process): Restore a line that was accidentally commented out (bug#11547).
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/callproc.c | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index cbfd6631892..0b1ef220fc0 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2012-05-24 Ken Brown <kbrown@cornell.edu> | ||
| 2 | |||
| 3 | * callproc.c (Fcall_process): Restore a line that was accidentally | ||
| 4 | commented out in the 2011-02-13 change (bug#11547). | ||
| 5 | |||
| 1 | 2012-05-23 Eli Zaretskii <eliz@gnu.org> | 6 | 2012-05-23 Eli Zaretskii <eliz@gnu.org> |
| 2 | 7 | ||
| 3 | * lisp.h [REL_ALLOC]: Add prototypes for external functions | 8 | * lisp.h [REL_ALLOC]: Add prototypes for external functions |
diff --git a/src/callproc.c b/src/callproc.c index b5b8cadeb68..d3ca7ebac95 100644 --- a/src/callproc.c +++ b/src/callproc.c | |||
| @@ -640,7 +640,7 @@ usage: (call-process PROGRAM &optional INFILE BUFFER DISPLAY &rest ARGS) */) | |||
| 640 | 640 | ||
| 641 | /* GConf causes us to ignore SIGPIPE, make sure it is restored | 641 | /* GConf causes us to ignore SIGPIPE, make sure it is restored |
| 642 | in the child. */ | 642 | in the child. */ |
| 643 | //signal (SIGPIPE, SIG_DFL); | 643 | signal (SIGPIPE, SIG_DFL); |
| 644 | #ifdef HAVE_WORKING_VFORK | 644 | #ifdef HAVE_WORKING_VFORK |
| 645 | pthread_sigmask (SIG_SETMASK, &procmask, 0); | 645 | pthread_sigmask (SIG_SETMASK, &procmask, 0); |
| 646 | #endif | 646 | #endif |