aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorEli Zaretskii2015-01-31 10:05:10 +0200
committerEli Zaretskii2015-01-31 10:05:10 +0200
commit376ba20ac1f516361fc9c2b0267fbc5c131e4822 (patch)
tree517c8456e32c47aff752b0cad9b226bdc79f5526 /src
parent512cdb9f2ba6dde0c24bfed13d095ea37e38a6ec (diff)
downloademacs-376ba20ac1f516361fc9c2b0267fbc5c131e4822.tar.gz
emacs-376ba20ac1f516361fc9c2b0267fbc5c131e4822.zip
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.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog6
-rw-r--r--src/dired.c2
2 files changed, 7 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index ab1a748abce..fd211304ac5 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
12015-01-31 Eli Zaretskii <eliz@gnu.org>
2
3 * dired.c (read_dirent): Correct the "MSDOS hacks" hack: the
4 special code for errno = ENOENT or EACCES is needed for WINDOWSNT,
5 not for MSDOS.
6
12015-01-31 Paul Eggert <eggert@cs.ucla.edu> 72015-01-31 Paul Eggert <eggert@cs.ucla.edu>
2 8
3 Simplify read_dirent's MSDOS hacks 9 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)
137 return dp; 137 return dp;
138 if (! (errno == EAGAIN || errno == EINTR)) 138 if (! (errno == EAGAIN || errno == EINTR))
139 { 139 {
140#ifdef MSDOS 140#ifdef WINDOWSNT
141 /* The MS-Windows implementation of 'opendir' doesn't 141 /* The MS-Windows implementation of 'opendir' doesn't
142 actually open a directory until the first call to 142 actually open a directory until the first call to
143 'readdir'. If 'readdir' fails to open the directory, it 143 'readdir'. If 'readdir' fails to open the directory, it