[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
feature/native-comp 38b0ead 3/6: * Back using `load-file-name' when read
From: |
Andrea Corallo |
Subject: |
feature/native-comp 38b0ead 3/6: * Back using `load-file-name' when reading '#$' (bug#42961) |
Date: |
Sat, 29 Aug 2020 10:20:50 -0400 (EDT) |
branch: feature/native-comp
commit 38b0ead7c1a8475bef7f811b07beed2c23cbc593
Author: Andrea Corallo <akrl@sdf.org>
Commit: Andrea Corallo <akrl@sdf.org>
* Back using `load-file-name' when reading '#$' (bug#42961)
* src/lread.c (read1, read_list): Use again load-file-name when
reading '#$'.
(syms_of_lread): Update `load-file-name' doc.
---
src/lread.c | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/src/lread.c b/src/lread.c
index 5b77868..326af30 100644
--- a/src/lread.c
+++ b/src/lread.c
@@ -3261,7 +3261,7 @@ read1 (Lisp_Object readcharfun, int *pch, bool
first_in_list)
goto retry;
}
if (c == '$')
- return Vload_true_file_name;
+ return Vload_file_name;
if (c == '\'')
return list2 (Qfunction, read0 (readcharfun));
/* #:foo is the uninterned symbol named foo. */
@@ -4062,7 +4062,7 @@ read_list (bool flag, Lisp_Object readcharfun)
first_in_list = 0;
/* While building, if the list starts with #$, treat it specially. */
- if (EQ (elt, Vload_true_file_name)
+ if (EQ (elt, Vload_file_name)
&& ! NILP (elt)
&& !NILP (Vpurify_flag))
{
@@ -4083,7 +4083,7 @@ read_list (bool flag, Lisp_Object readcharfun)
elt = concat2 (dot_dot_lisp, Ffile_name_nondirectory (elt));
}
}
- else if (EQ (elt, Vload_true_file_name)
+ else if (EQ (elt, Vload_file_name)
&& ! NILP (elt)
&& load_force_doc_strings)
doc_reference = 2;
@@ -5039,8 +5039,10 @@ directory. These file names are converted to absolute
at startup. */);
DEFVAR_LISP ("load-file-name", Vload_file_name,
doc: /* Full name of file being loaded by `load'.
-In case a .eln file is being loaded this is unreliable and
`load-true-file-name'
-should be used instead. */);
+
+In case of native code being loaded this is indicating the
+corresponding bytecode filename. Use `load-true-file-name' to obtain
+the .eln filename. */);
Vload_file_name = Qnil;
DEFVAR_LISP ("load-true-file-name", Vload_true_file_name,
- 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, 2020/08/29
- 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 <=
- 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