2 files changed, 5 insertions, 1 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 45d48ba41cc..df8bf602afe 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,8 @@
 2012-11-17  Eli Zaretskii  <eliz@gnu.org>
 
+        * w32.c (faccessat): Pretend that directories have the execute bit
+        set.  Emacs expects that, e.g., in files.el:cd-absolute.
+
         * w32proc.c (create_child): Don't clip the PID of the child
         process to fit into an Emacs integer, as this is no longer a
         restriction.
diff --git a/src/w32.c b/src/w32.c
index eb07e13a2fb..46433626802 100644
--- a/src/w32.c
+++ b/src/w32.c
@@ -2762,7 +2762,8 @@ faccessat (int dirfd, const char * path, int mode, int flags)
         }
       return -1;
     }
-  if ((mode & X_OK) != 0 && !is_exec (path))
+  if ((mode & X_OK) != 0
+      && !(is_exec (path) || (attributes & FILE_ATTRIBUTE_DIRECTORY) != 0))
     {
       errno = EACCES;
       return -1;