Merge from origin/emacs-24

[gnu-emacs] / src / dired.c

diff --git a/src/dired.c b/src/dired.c
index e31fdf87ac29d81a38991366ef32647be41dccd9..757eb6d30cda5105b5fe058c53113324e407a921 100644 (file)
--- a/src/dired.c
+++ b/src/dired.c
@@ -238,6 +238,19 @@ directory_files_internal (Lisp_Object directory, Lisp_Object full,
              QUIT;
              continue;
            }
+#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
+            sets errno to ENOTDIR; we convert it here to ENOENT so
+            that the error message is similar to what happens on
+            Posix hosts in such cases.  */
+         if (errno == ENOTDIR)
+           {
+             errno = ENOENT;
+             report_file_error ("Opening directory", directory);
+           }
+#endif
          break;
        }