[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
feature/native-comp 696ab2e 2/6: * src/lread.c (Fload): Bind load-file-n
From: |
Andrea Corallo |
Subject: |
feature/native-comp 696ab2e 2/6: * src/lread.c (Fload): Bind load-file-name to the .elc filename. |
Date: |
Sat, 29 Aug 2020 10:20:50 -0400 (EDT) |
branch: feature/native-comp
commit 696ab2eb17cf8850a65814f428287848b7d23d64
Author: Andrea Corallo <akrl@sdf.org>
Commit: Andrea Corallo <akrl@sdf.org>
* src/lread.c (Fload): Bind load-file-name to the .elc filename.
---
src/lread.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/lread.c b/src/lread.c
index 3d0de49..5b77868 100644
--- a/src/lread.c
+++ b/src/lread.c
@@ -1477,8 +1477,10 @@ Return t if the file exists and loads successfully. */)
same folder of their respective sources therfore not to break
packages we fake `load-file-name' here. The non faked
version of it is `load-true-file-name'. */
- specbind (Qload_file_name, Fgethash (Ffile_name_nondirectory (found),
- Vcomp_eln_to_el_h, Qnil));
+ Lisp_Object el_name = Fgethash (Ffile_name_nondirectory (found),
+ Vcomp_eln_to_el_h, Qnil);
+ specbind (Qload_file_name,
+ NILP (el_name) ? Qnil : concat2 (el_name, build_string ("c")));
}
else
specbind (Qload_file_name, found);
- feature/native-comp updated (aa526c9 -> ea35a62), Andrea Corallo, 2020/08/29
- feature/native-comp 696ab2e 2/6: * src/lread.c (Fload): Bind load-file-name to the .elc filename.,
Andrea Corallo <=
- feature/native-comp c3514a6 1/6: Merge remote-tracking branch 'savannah/master' into HEAD, Andrea Corallo, 2020/08/29
- feature/native-comp 38b0ead 3/6: * Back using `load-file-name' when reading '#$' (bug#42961), Andrea Corallo, 2020/08/29
- feature/native-comp 87b9c3e 4/6: Have .elc files in `load-history' when loading native code (bug#43089), Andrea Corallo, 2020/08/29
- feature/native-comp ea35a62 6/6: * test/src/comp-tests.el (comp-tests-doc): Update test., Andrea Corallo, 2020/08/29
- feature/native-comp 59a40b0 5/6: * lisp/startup.el (command-line): Clean-up logic for new .eln disposition., Andrea Corallo, 2020/08/29