From: Andrea Corallo Date: Mon, 13 Apr 2020 15:57:27 +0000 (+0100) Subject: * src/lread.c (Fload): Clean-up unnecessary sanity check. X-Git-Tag: emacs-28.0.90~2727^2~705 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=97873235523dd6fc236b3ebc7bf34a53fb5a528a;p=emacs.git * src/lread.c (Fload): Clean-up unnecessary sanity check. 'is_native_elisp' can't be non zero if NATIVE_COMP_FLAG is not set. --- diff --git a/src/lread.c b/src/lread.c index 9bd60b9b386..1e05ac69320 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 {