procyberian/emacs
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Reinstate the Qload file name handler

Browse source 
* src/lread.c (Fload): Reinstate the Qload file name handler
(bug#12598).  This makes loading non-ASCII elc.gz files work.
This commit is contained in:
Lars Ingebrigtsen 2022-06-02 11:51:09 +02:00
parent a947c10d90
commit c7b7c9d40f
2 changed files with 4 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/lread.c
View file

@ -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

3
test/lisp/files-tests.el
View file

@ -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))