4 files changed, 14 insertions, 1 deletions

diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index 1c8f239eb9d..cd39f44fc98 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,7 @@
+2013-08-13  Xue Fuqiao  <xfq.free@gmail.com>
+
+        * frames.texi (Display Feature Testing): Add an index.
+
 2013-08-12  Glenn Morris  <rgm@gnu.org>
 
         * Makefile.in (prefix, datarootdir, datadir, PACKAGE_TARNAME)
diff --git a/doc/lispref/frames.texi b/doc/lispref/frames.texi
index 37b48cdb6a9..00cf4dc6be4 100644
--- a/doc/lispref/frames.texi
+++ b/doc/lispref/frames.texi
@@ -1362,7 +1362,7 @@ Terminals}.
 @node Input Focus
 @section Input Focus
 @cindex input focus
-@c @cindex selected frame    Duplicates selected-frame
+@c @cindex selected frame    Duplicates selected-frame, same for selected-window.
 
 At any time, one frame in Emacs is the @dfn{selected frame}.  The selected
 window always resides on the selected frame.
@@ -2391,6 +2391,7 @@ displays returned by @code{display-mm-height} and
 @code{display-mm-width} in case the system provides incorrect values.
 @end defopt
 
+@cindex backing store
 @defun display-backing-store &optional display
 This function returns the backing store capability of the display.
 Backing store means recording the pixels of windows (and parts of
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))
         {