diff options
| author | Lars Ingebrigtsen <larsi@gnus.org> | 2022-06-02 11:51:09 +0200 |
|---|---|---|
| committer | Lars Ingebrigtsen <larsi@gnus.org> | 2022-06-02 11:51:09 +0200 |
| commit | c7b7c9d40f9b8f73792cf434ee3b2fdfe62af3cc (patch) | |
| tree | 55357ac325c2f18f710d8974834d13d218ef431c | |
| parent | a947c10d9093b9f3a29b60a52bda8afa43b6fd29 (diff) | |
| download | emacs-c7b7c9d40f9b8f73792cf434ee3b2fdfe62af3cc.tar.gz emacs-c7b7c9d40f9b8f73792cf434ee3b2fdfe62af3cc.tar.bz2 emacs-c7b7c9d40f9b8f73792cf434ee3b2fdfe62af3cc.zip | |
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.
| -rw-r--r-- | src/lread.c | 7 | ||||
| -rw-r--r-- | test/lisp/files-tests.el | 3 |
2 files changed, 4 insertions, 6 deletions
diff --git a/src/lread.c b/src/lread.c index a1045184d9b..158ac360423 100644 --- 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 c7ce03cc9b2..54ada088003 100644 --- 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)) |