Merge from emacs-24; up to 2012-12-23T02:41:17Z!rgm@gnu.org

2 files changed, 5 insertions, 2 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 4135dadf28a..1b8b3c56004 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2013-02-28  Eli Zaretskii  <eliz@gnu.org>
+
+        * w32.c (sys_open): Don't reset the flags for FD in fd_info[].
+        (Bug#13546).
+
 2013-02-27  Eli Zaretskii  <eliz@gnu.org>
 
         * filelock.c (create_lock_file) [WINDOWSNT]: Use _sopen with
diff --git a/src/w32.c b/src/w32.c
index aff9771e4bb..f42b83af605 100644
--- a/src/w32.c
+++ b/src/w32.c
@@ -3411,8 +3411,6 @@ sys_open (const char * path, int oflag, int mode)
     res = _open (mpath, (oflag & ~_O_CREAT) | _O_NOINHERIT, mode);
   if (res < 0)
     res = _open (mpath, oflag | _O_NOINHERIT, mode);
-  if (res >= 0 && res < MAXDESC)
-    fd_info[res].flags = 0;
 
   return res;
 }