aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggert2013-08-12 13:17:32 -0700
committerPaul Eggert2013-08-12 13:17:32 -0700
commit297a545bb4482efe73456afa4a7d5aae67fd0fdb (patch)
tree110fcb4acae5cecbe949b022254ef0c917c74455
parentaa942e2bf4545365d7fb7e9d787e4a21642fbf4c (diff)
downloademacs-297a545bb4482efe73456afa4a7d5aae67fd0fdb.tar.gz
emacs-297a545bb4482efe73456afa4a7d5aae67fd0fdb.zip
* process.c (deactivate_process): Reset fds to -1.
This fixes a problem introduced by the Bug#15035 patch when using GPG. Reported by Herbert J. Skuhra.
-rw-r--r--src/ChangeLog6
-rw-r--r--src/process.c2
2 files changed, 8 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 04c89b63fa4..3b8dfe011ee 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
12013-08-12 Paul Eggert <eggert@cs.ucla.edu>
2
3 * process.c (deactivate_process): Reset fds to -1 (Bug#15035).
4 This fixes a problem introduced by the Bug#15035 patch
5 when using GPG. Reported by Herbert J. Skuhra.
6
12013-08-12 Eli Zaretskii <eliz@gnu.org> 72013-08-12 Eli Zaretskii <eliz@gnu.org>
2 8
3 * decompress.c <zlib_initialized> [WINDOWSNT]: New static variable. 9 * decompress.c <zlib_initialized> [WINDOWSNT]: New static variable.
diff --git a/src/process.c b/src/process.c
index a2bcffe5160..c803d69d6d8 100644
--- a/src/process.c
+++ b/src/process.c
@@ -3842,6 +3842,8 @@ deactivate_process (Lisp_Object proc)
3842 3842
3843 if (inchannel >= 0) 3843 if (inchannel >= 0)
3844 { 3844 {
3845 p->infd = -1;
3846 p->outfd = -1;
3845#ifdef DATAGRAM_SOCKETS 3847#ifdef DATAGRAM_SOCKETS
3846 if (DATAGRAM_CHAN_P (inchannel)) 3848 if (DATAGRAM_CHAN_P (inchannel))
3847 { 3849 {