diff tests/automated/file-tests.el @ 5916:1152e0091f8c

Avoid confusion about ELC vs. source file encoding, #'load, #'load-internal. lisp/ChangeLog addition: 2015-06-03 Aidan Kehoe <kehoea@parhasard.net> * code-files.el (load): Revise this to respect load-ignore-out-of-date-elc-files, rather than leaving that to #'load-internal. Avoids a corner case where the source and the compiled file have different, incompatible encodings. Move the call to #'substitute-in-file-name here. No longer check for a zero-length filename, since #'load-internal no longer chokes on same and errors correctly. src/ChangeLog addition: 2015-06-03 Aidan Kehoe <kehoea@parhasard.net> * lread.c (Fload_internal): Delegate calling the handler and #'substitute-in-file-name to #'load. Error correctly with a zero-length file name, instead of giving a bus error on my machine. Delegate the check for out-of-date ELC files to #'load, avoiding a bug where the encoding of the ELC file and the source file differed. * lread.c (PRINT_LOADING_MESSAGE_1): This is simplified, now we no longer have to talk about out-of-date ELC files. tests/ChangeLog addition: 2015-06-03 Aidan Kehoe <kehoea@parhasard.net> * automated/file-tests.el: Gross sanity check for #'load and #'load-internal with a zero-length FILE, something that crashed until today.
author Aidan Kehoe <kehoea@parhasard.net>
date Wed, 03 Jun 2015 20:13:07 +0100
parents 308d34e9f07d
children
line wrap: on
line diff
--- a/tests/automated/file-tests.el	Fri May 29 17:06:24 2015 +0100
+++ b/tests/automated/file-tests.el	Wed Jun 03 20:13:07 2015 +0100
@@ -40,4 +40,11 @@
   do
   (Assert (equal (file-truename (file-truename file)) (file-truename file))))
 
+;;
+;; Gross sanity check with #'load and a zero-length filename:
+(Check-Error file-error (load ""))
+(Assert (eq nil (load "" t)))
+(Check-Error file-error (load-internal ""))
+(Assert (eq nil (load-internal "" t)))
 
+;;; end of file-tests.el