Merge commit '107ce3050fc37b9a13d8304ae1bb73fac9de5f61'

1 files changed, 17 insertions, 5 deletions

diff --git a/src/lread.c b/src/lread.c
index 6ae7a0d8ba0..99e0ce30ba6 100644
--- a/src/lread.c
+++ b/src/lread.c
@@ -1343,18 +1343,26 @@ Return t if the file exists and loads successfully.  */)
           /* openp already checked for newness, no point doing it again.
              FIXME would be nice to get a message when openp
              ignores suffix order due to load_prefer_newer.  */
+          Lisp_Object notfound = found;
           if (!load_prefer_newer && is_elc)
             {
               result = stat (SSDATA (efound), &s1);
+              int err = errno;
               if (result == 0)
                 {
                   SSET (efound, SBYTES (efound) - 1, 0);
                   result = stat (SSDATA (efound), &s2);
+                  err = errno;
                   SSET (efound, SBYTES (efound) - 1, 'c');
+                  if (result != 0)
+                    notfound = Fsubstring (found, make_fixnum (0),
+                                           make_fixnum (-1));
                 }
-
-              if (result == 0
-                  && timespec_cmp (get_stat_mtime (&s1), get_stat_mtime (&s2)) < 0)
+              if (result != 0)
+                file_test_errno (notfound, err);
+              else if (timespec_cmp (get_stat_mtime (&s1),
+                                     get_stat_mtime (&s2))
+                       < 0)
                 {
                   /* Make the progress messages mention that source is newer.  */
                   newer = 1;
@@ -1748,16 +1756,20 @@ openp (Lisp_Object path, Lisp_Object str, Lisp_Object suffixes,
                   {
                     if (file_directory_p (encoded_fn))
                       last_errno = EISDIR;
-                    else
+                    else if (errno == ENOENT || errno == ENOTDIR)
                       fd = 1;
+                    else
+                      last_errno = errno;
                   }
+                else if (! (errno == ENOENT || errno == ENOTDIR))
+                  last_errno = errno;
               }
             else
               {
                 fd = emacs_open (pfn, O_RDONLY, 0);
                 if (fd < 0)
                   {
-                    if (errno != ENOENT)
+                    if (! (errno == ENOENT || errno == ENOTDIR))
                       last_errno = errno;
                   }
                 else