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.

--- a/lisp/ChangeLog	Fri May 29 17:06:24 2015 +0100
+++ b/lisp/ChangeLog	Wed Jun 03 20:13:07 2015 +0100
@@ -1,3 +1,14 @@
+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.
+
 2015-05-15  Aidan Kehoe  <kehoea@parhasard.net>
 
 	* simple.el: