Reinstate the Qload file name handler

* src/lread.c (Fload): Reinstate the Qload file name handler
(bug#12598).  This makes loading non-ASCII elc.gz files work.

diff --git a/src/lread.c b/src/lread.c
index a1045184d9bb000d9ffa565a8d1753b52a5e9b46..158ac3604231c93d042171fd9c30bea62014378c 100644 (file)
--- a/src/lread.c
+++ b/src/lread.c
@@ -1244,10 +1244,9 @@ Return t if the file exists and loads successfully.  */)
   CHECK_STRING (file);
 
   /* If file name is magic, call the handler.  */
-  /* This shouldn't be necessary any more now that `openp' handles it right.
-    handler = Ffind_file_name_handler (file, Qload);
-    if (!NILP (handler))
-      return call5 (handler, Qload, file, noerror, nomessage, nosuffix); */
+  handler = Ffind_file_name_handler (file, Qload);
+  if (!NILP (handler))
+    return call5 (handler, Qload, file, noerror, nomessage, nosuffix);
 
   /* The presence of this call is the result of a historical accident:
      it used to be in every file-operation and when it got removed

diff --git a/test/lisp/files-tests.el b/test/lisp/files-tests.el
index c7ce03cc9b2dcdca343bc2b6dde22e398d34ecbd..54ada0880030eeb366af2902492271dbfac467f0 100644 (file)
--- a/test/lisp/files-tests.el
+++ b/test/lisp/files-tests.el
@@ -939,7 +939,7 @@ unquoted file names."
   (files-tests--with-temp-non-special (tmpfile nospecial)
     (should (load nospecial nil t)))
   (files-tests--with-temp-non-special-and-file-name-handler (tmpfile nospecial)
-    (should (load nospecial nil t))))
+    (should-error (load nospecial nil t))))
 
 (ert-deftest files-tests-file-name-non-special-make-auto-save-file-name ()
   (files-tests--with-temp-non-special (tmpfile nospecial)
@@ -1838,7 +1838,6 @@ Prompt users for any modified buffer with `buffer-offer-save' non-nil."
   (should (eq major-mode 'text-mode)))
 
 (ert-deftest files-load-elc-gz-file ()
-  :expected-result :failed
   (skip-unless (executable-find "gzip"))
   (ert-with-temp-directory dir
     (let* ((pref (expand-file-name "compile-utf8" dir))