merge from trunk

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 @@
+2013-08-12  Paul Eggert  <eggert@cs.ucla.edu>
+
+        * process.c (deactivate_process): Reset fds to -1 (Bug#15035).
+        This fixes a problem introduced by the Bug#15035 patch
+        when using GPG.  Reported by Herbert J. Skuhra.
+
 2013-08-12  Eli Zaretskii  <eliz@gnu.org>
 
         * 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)
 
   if (inchannel >= 0)
     {
+      p->infd  = -1;
+      p->outfd = -1;
 #ifdef DATAGRAM_SOCKETS
       if (DATAGRAM_CHAN_P (inchannel))
         {