diff options
| author | Miles Bader | 2005-05-20 04:22:05 +0000 |
|---|---|---|
| committer | Miles Bader | 2005-05-20 04:22:05 +0000 |
| commit | 64e9342958694825be1664890dcd22fffcd50d3a (patch) | |
| tree | a43e1796f5a49ae7eeec671447d10ac3731a1834 /src/process.c | |
| parent | 5447510256e5a1b371407b751ddcc461044da5df (diff) | |
| parent | a18ff9886771c41186eebf8d7984fee2120dbe36 (diff) | |
| download | emacs-64e9342958694825be1664890dcd22fffcd50d3a.tar.gz emacs-64e9342958694825be1664890dcd22fffcd50d3a.zip | |
Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-53
Merge from emacs--cvs-trunk--0
Patches applied:
* emacs--cvs-trunk--0 (patch 302-319)
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 69)
- Update from CVS
Diffstat (limited to 'src/process.c')
| -rw-r--r-- | src/process.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/process.c b/src/process.c index 26d40c26cd5..84d373ff37b 100644 --- a/src/process.c +++ b/src/process.c | |||
| @@ -5113,6 +5113,7 @@ send_process_trap () | |||
| 5113 | sigrelse (SIGPIPE); | 5113 | sigrelse (SIGPIPE); |
| 5114 | sigrelse (SIGALRM); | 5114 | sigrelse (SIGALRM); |
| 5115 | #endif /* BSD4_1 */ | 5115 | #endif /* BSD4_1 */ |
| 5116 | sigunblock (sigmask (SIGPIPE)); | ||
| 5116 | longjmp (send_process_frame, 1); | 5117 | longjmp (send_process_frame, 1); |
| 5117 | } | 5118 | } |
| 5118 | 5119 | ||
| @@ -5297,7 +5298,11 @@ send_process (proc, buf, len, object) | |||
| 5297 | 0, datagram_address[outfd].sa, | 5298 | 0, datagram_address[outfd].sa, |
| 5298 | datagram_address[outfd].len); | 5299 | datagram_address[outfd].len); |
| 5299 | if (rv < 0 && errno == EMSGSIZE) | 5300 | if (rv < 0 && errno == EMSGSIZE) |
| 5300 | report_file_error ("sending datagram", Fcons (proc, Qnil)); | 5301 | { |
| 5302 | signal (SIGPIPE, old_sigpipe); | ||
| 5303 | report_file_error ("sending datagram", | ||
| 5304 | Fcons (proc, Qnil)); | ||
| 5305 | } | ||
| 5301 | } | 5306 | } |
| 5302 | else | 5307 | else |
| 5303 | #endif | 5308 | #endif |