Merge from origin/emacs-24

ad588af Improve the fix for bug #19701

Conflicts:
	src/ChangeLog

1 files changed, 12 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 36a3e8d64d2..96e6aa25d5e 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,17 @@
 2015-01-29  Eli Zaretskii  <eliz@gnu.org>
 
+        * dired.c (directory_files_internal, file_name_completion)
+        [WINDOWSNT]: Signal an error when errno is set non-zero by
+        'readdir', regardless of its value.
+
+        * w32.c (sys_readdir): Set errno to ENOENT when the directory
+        doesn't exist and to EACCES when it's not accessible to the
+        current user.  Set errno to zero when FindNextFile exhausts the
+        directory, so that callers don't interpret that as an error and
+        don't signal a file-error.
+        (open_unc_volume): Set errno to ENOENT if WNetOpenEnum fails.
+2015-01-29  Eli Zaretskii  <eliz@gnu.org>
+
         Use bool for boolean in w32menu.c, w32font.c, w32uniscribe.c.
         * w32uniscribe.c (uniscribe_list, uniscribe_match): Use bool where
         appropriate.