Merge from trunk

1 files changed, 3 insertions, 4 deletions

diff --git a/src/lread.c b/src/lread.c
index 77b397a03df..c8c07bed476 100644
--- a/src/lread.c
+++ b/src/lread.c
@@ -1509,7 +1509,7 @@ openp (Lisp_Object path, Lisp_Object str, Lisp_Object suffixes, Lisp_Object *sto
                   Lisp_Object tmp = call1 (predicate, string);
                   exists = !NILP (tmp)
                     && (EQ (tmp, Qdir_ok)
-                        || !NILP (Ffile_directory_p (string)));
+                        || NILP (Ffile_directory_p (string)));
                 }
 
               if (exists)
@@ -1527,8 +1527,7 @@ openp (Lisp_Object path, Lisp_Object str, Lisp_Object suffixes, Lisp_Object *sto
 
               encoded_fn = ENCODE_FILE (string);
               pfn = SSDATA (encoded_fn);
-              exists = (stat (pfn, &st) >= 0
-                        && (st.st_mode & S_IFMT) != S_IFDIR);
+              exists = (stat (pfn, &st) == 0 && ! S_ISDIR (st.st_mode));
               if (exists)
                 {
                   /* Check that we can access or open it.  */
@@ -4537,7 +4536,7 @@ This variable is automatically set from the file variables of an interpreted
 
   Qdir_ok = intern_c_string ("dir-ok");
   staticpro (&Qdir_ok);
-  
+
   Qdo_after_load_evaluation = intern_c_string ("do-after-load-evaluation");
   staticpro (&Qdo_after_load_evaluation) ;