From: Eli Zaretskii Date: Fri, 22 Jan 2010 08:44:50 +0000 (+0200) Subject: Fix bug #5303 in `load' on MS-Windows, whereby load-file would fail X-Git-Tag: emacs-pretest-23.1.92~30^2~3^2~23 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=74327f7a7c4f8fb1ea4bacd8147ac5b1169231c3;p=emacs.git 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 bdbdd0b0da9..2a3263588c4 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,9 @@ +2010-01-22 Eli Zaretskii + + * 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 * coding.c (consume_chars): If ! multibyte and the encoder is ccl, diff --git a/src/lread.c b/src/lread.c index db425b82299..ba9d5378104 100644 --- 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! */ {