From: Eli Zaretskii <eliz@gnu.org>
Date: Sat, 31 Jan 2015 08:05:10 +0000 (+0200)
Subject: Fix last commit, which confused WINDOWSNT with MSDOS.
X-Git-Tag: emacs-25.0.90~2572^2~3
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=376ba20ac1f516361fc9c2b0267fbc5c131e4822;p=emacs.git

Fix last commit, which confused WINDOWSNT with MSDOS.

 src/dired.c (read_dirent): Correct the "MSDOS hacks" hack: the
 special code for errno = ENOENT or EACCES is needed for WINDOWSNT,
 not for MSDOS.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index ab1a748abce..fd211304ac5 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2015-01-31  Eli Zaretskii  <eliz@gnu.org>
+
+	* dired.c (read_dirent): Correct the "MSDOS hacks" hack: the
+	special code for errno = ENOENT or EACCES is needed for WINDOWSNT,
+	not for MSDOS.
+
 2015-01-31  Paul Eggert  <eggert@cs.ucla.edu>
 
 	Simplify read_dirent's MSDOS hacks
diff --git a/src/dired.c b/src/dired.c
index 931279a0764..5038e04cd01 100644
--- a/src/dired.c
+++ b/src/dired.c
@@ -137,7 +137,7 @@ read_dirent (DIR *dir, Lisp_Object dirname)
 	return dp;
       if (! (errno == EAGAIN || errno == EINTR))
 	{
-#ifdef MSDOS
+#ifdef WINDOWSNT
 	  /* The MS-Windows implementation of 'opendir' doesn't
 	     actually open a directory until the first call to
 	     'readdir'.  If 'readdir' fails to open the directory, it