diff options
| author | Glenn Morris | 2012-05-26 18:06:44 -0700 |
|---|---|---|
| committer | Glenn Morris | 2012-05-26 18:06:44 -0700 |
| commit | 33017fafd17d722e82a268e9b272f27df261e09d (patch) | |
| tree | 9c34640f09d51059804961d697ed9b07e19571d3 /src/callproc.c | |
| parent | caf8a9b2b301aba06735d403317b75b41df59bfe (diff) | |
| parent | ed7bebbb489cf6f893fc35a2a6714b0d8e7e8a90 (diff) | |
| download | emacs-33017fafd17d722e82a268e9b272f27df261e09d.tar.gz emacs-33017fafd17d722e82a268e9b272f27df261e09d.zip | |
Merge from emacs-24; up to 2012-04-24T08:35:02Z!lekktu@gmail.com
Diffstat (limited to 'src/callproc.c')
| -rw-r--r-- | src/callproc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/callproc.c b/src/callproc.c index 1dd56749e16..f7c9971907d 100644 --- a/src/callproc.c +++ b/src/callproc.c | |||
| @@ -652,7 +652,7 @@ usage: (call-process PROGRAM &optional INFILE BUFFER DISPLAY &rest ARGS) */) | |||
| 652 | 652 | ||
| 653 | /* GConf causes us to ignore SIGPIPE, make sure it is restored | 653 | /* GConf causes us to ignore SIGPIPE, make sure it is restored |
| 654 | in the child. */ | 654 | in the child. */ |
| 655 | //signal (SIGPIPE, SIG_DFL); | 655 | signal (SIGPIPE, SIG_DFL); |
| 656 | #ifdef HAVE_WORKING_VFORK | 656 | #ifdef HAVE_WORKING_VFORK |
| 657 | pthread_sigmask (SIG_SETMASK, &procmask, 0); | 657 | pthread_sigmask (SIG_SETMASK, &procmask, 0); |
| 658 | #endif | 658 | #endif |