Fix bug #5303 in `load' on MS-Windows, whereby load-file would fail

for files like C:/the-file.el in root directory of any drive.

 lread.c (Fload): Don't treat files without .elc extension as
 byte-compiled if they are ``magic'', i.e. `openp' returned -2 for
 them.

diff --git a/src/ChangeLog b/src/ChangeLog
index bdbdd0b0da981a09525dfc31e0f72bf30713bf09..2a3263588c4592f16f6b3e6d116dbc70813fe91c 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2010-01-22  Eli Zaretskii  <eliz@gnu.org>
+
+       * lread.c (Fload): Don't treat files without .elc extension as
+       byte-compiled if they are ``magic'', i.e. `openp' returned -2 for
+       them.  (bug#5303)
+
 2010-01-20  Kenichi Handa  <handa@m17n.org>
 
        * coding.c (consume_chars): If ! multibyte and the encoder is ccl,

diff --git a/src/lread.c b/src/lread.c
index db425b82299c1bd5b9cad4edf0efec31406b4ab6..ba9d5378104f462c9eca9f2669b7156302f803bf 100644 (file)
--- a/src/lread.c
+++ b/src/lread.c
@@ -1155,7 +1155,7 @@ Return t if the file exists and loads successfully.  */)
 
   if (!bcmp (SDATA (found) + SBYTES (found) - 4,
             ".elc", 4)
-      || (version = safe_to_load_p (fd)) > 0)
+      || (fd >= 0 && (version = safe_to_load_p (fd)) > 0))
     /* Load .elc files directly, but not when they are
        remote and have no handler!  */
     {