[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
feature/native-comp 9787323 2/3: * src/lread.c (Fload): Clean-up unneces
From: |
Andrea Corallo |
Subject: |
feature/native-comp 9787323 2/3: * src/lread.c (Fload): Clean-up unnecessary sanity check. |
Date: |
Mon, 13 Apr 2020 13:20:49 -0400 (EDT) |
branch: feature/native-comp
commit 97873235523dd6fc236b3ebc7bf34a53fb5a528a
Author: Andrea Corallo <address@hidden>
Commit: Andrea Corallo <address@hidden>
* src/lread.c (Fload): Clean-up unnecessary sanity check.
'is_native_elisp' can't be non zero if NATIVE_COMP_FLAG is not set.
---
src/lread.c | 22 ++++++++--------------
1 file changed, 8 insertions(+), 14 deletions(-)
diff --git a/src/lread.c b/src/lread.c
index 9bd60b9..1e05ac6 100644
--- a/src/lread.c
+++ b/src/lread.c
@@ -1506,22 +1506,16 @@ Return t if the file exists and loads successfully. */)
}
else if (is_native_elisp)
{
- if (NATIVE_COMP_FLAG)
+ specbind (Qcurrent_load_list, Qnil);
+ if (!NILP (Vpurify_flag))
{
- specbind (Qcurrent_load_list, Qnil);
- if (!NILP (Vpurify_flag))
- {
- Lisp_Object base = parent_directory (Ffile_name_directory
(found));
- Lisp_Object offset = Flength (base);
- hist_file_name = Fsubstring (found, offset, Qnil);
- }
- LOADHIST_ATTACH (hist_file_name);
- Fnative_elisp_load (found, Qnil);
- build_load_history (hist_file_name, true);
+ Lisp_Object base = parent_directory (Ffile_name_directory (found));
+ Lisp_Object offset = Flength (base);
+ hist_file_name = Fsubstring (found, offset, Qnil);
}
- else
- /* This cannot happen. */
- emacs_abort ();
+ LOADHIST_ATTACH (hist_file_name);
+ Fnative_elisp_load (found, Qnil);
+ build_load_history (hist_file_name, true);
}
else
{