diff options
| author | Jan D <[email protected]> | 2011-02-13 12:28:42 +0100 |
|---|---|---|
| committer | Jan D <[email protected]> | 2011-02-13 12:28:42 +0100 |
| commit | 2f9a22e2c127dc2d19144ea15cf0d73402e19e56 (patch) | |
| tree | 4e5246857ad3aea2352dc4ed1b793eebe056388f | |
| parent | 75d4dcc9d2d109fc51e67c86017bce22e5f4252c (diff) | |
* callproc.c (Fcall_process):
* process.c (create_process): Replace Gtk with GConf in SIGPIPE
comment.
| -rw-r--r-- | src/ChangeLog | 6 | ||||
| -rw-r--r-- | src/callproc.c | 4 | ||||
| -rw-r--r-- | src/process.c | 2 |
3 files changed, 9 insertions, 3 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index c677288ad3..5ca0776bd9 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,9 @@ +2011-02-13 Jan Djärv <[email protected]> + + * callproc.c (Fcall_process): + * process.c (create_process): Replace Gtk with GConf in SIGPIPE + comment. + 2011-02-12 Martin Rudalics <[email protected]> * window.c (select_window): Check inhibit_point_swap argument when diff --git a/src/callproc.c b/src/callproc.c index 27e8493bcf..f2543f296d 100644 --- a/src/callproc.c +++ b/src/callproc.c @@ -559,9 +559,9 @@ usage: (call-process PROGRAM &optional INFILE BUFFER DISPLAY &rest ARGS) */) setpgrp (pid, pid); #endif /* USG */ - /* GTK causes us to ignore SIGPIPE, make sure it is restored + /* GConf causes us to ignore SIGPIPE, make sure it is restored in the child. */ - signal (SIGPIPE, SIG_DFL); + //signal (SIGPIPE, SIG_DFL); #ifdef HAVE_WORKING_VFORK sigprocmask (SIG_SETMASK, &procmask, 0); #endif diff --git a/src/process.c b/src/process.c index d026b9d030..00d6c2e16d 100644 --- a/src/process.c +++ b/src/process.c @@ -2056,7 +2056,7 @@ create_process (Lisp_Object process, char **new_argv, Lisp_Object current_dir) signal (SIGINT, SIG_DFL); signal (SIGQUIT, SIG_DFL); - /* GTK causes us to ignore SIGPIPE, make sure it is restored + /* GConf causes us to ignore SIGPIPE, make sure it is restored in the child. */ signal (SIGPIPE, SIG_DFL); |