diff options
| author | Jan D | 2011-02-13 12:28:42 +0100 |
|---|---|---|
| committer | Jan D | 2011-02-13 12:28:42 +0100 |
| commit | 2f9a22e2c127dc2d19144ea15cf0d73402e19e56 (patch) | |
| tree | 4e5246857ad3aea2352dc4ed1b793eebe056388f /src | |
| parent | 75d4dcc9d2d109fc51e67c86017bce22e5f4252c (diff) | |
| download | emacs-2f9a22e2c127dc2d19144ea15cf0d73402e19e56.tar.gz emacs-2f9a22e2c127dc2d19144ea15cf0d73402e19e56.zip | |
* callproc.c (Fcall_process):
* process.c (create_process): Replace Gtk with GConf in SIGPIPE
comment.
Diffstat (limited to 'src')
| -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 c677288ad3e..5ca0776bd97 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,9 @@ | |||
| 1 | 2011-02-13 Jan Djärv <jan.h.d@swipnet.se> | ||
| 2 | |||
| 3 | * callproc.c (Fcall_process): | ||
| 4 | * process.c (create_process): Replace Gtk with GConf in SIGPIPE | ||
| 5 | comment. | ||
| 6 | |||
| 1 | 2011-02-12 Martin Rudalics <rudalics@gmx.at> | 7 | 2011-02-12 Martin Rudalics <rudalics@gmx.at> |
| 2 | 8 | ||
| 3 | * window.c (select_window): Check inhibit_point_swap argument when | 9 | * window.c (select_window): Check inhibit_point_swap argument when |
diff --git a/src/callproc.c b/src/callproc.c index 27e8493bcf1..f2543f296d5 100644 --- a/src/callproc.c +++ b/src/callproc.c | |||
| @@ -559,9 +559,9 @@ usage: (call-process PROGRAM &optional INFILE BUFFER DISPLAY &rest ARGS) */) | |||
| 559 | setpgrp (pid, pid); | 559 | setpgrp (pid, pid); |
| 560 | #endif /* USG */ | 560 | #endif /* USG */ |
| 561 | 561 | ||
| 562 | /* GTK causes us to ignore SIGPIPE, make sure it is restored | 562 | /* GConf causes us to ignore SIGPIPE, make sure it is restored |
| 563 | in the child. */ | 563 | in the child. */ |
| 564 | signal (SIGPIPE, SIG_DFL); | 564 | //signal (SIGPIPE, SIG_DFL); |
| 565 | #ifdef HAVE_WORKING_VFORK | 565 | #ifdef HAVE_WORKING_VFORK |
| 566 | sigprocmask (SIG_SETMASK, &procmask, 0); | 566 | sigprocmask (SIG_SETMASK, &procmask, 0); |
| 567 | #endif | 567 | #endif |
diff --git a/src/process.c b/src/process.c index d026b9d030b..00d6c2e16da 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) | |||
| 2056 | 2056 | ||
| 2057 | signal (SIGINT, SIG_DFL); | 2057 | signal (SIGINT, SIG_DFL); |
| 2058 | signal (SIGQUIT, SIG_DFL); | 2058 | signal (SIGQUIT, SIG_DFL); |
| 2059 | /* GTK causes us to ignore SIGPIPE, make sure it is restored | 2059 | /* GConf causes us to ignore SIGPIPE, make sure it is restored |
| 2060 | in the child. */ | 2060 | in the child. */ |
| 2061 | signal (SIGPIPE, SIG_DFL); | 2061 | signal (SIGPIPE, SIG_DFL); |
| 2062 | 2062 | ||