]> git.eshelyaron.com Git - emacs.git/commitdiff
* src/lread.c (Fload): Clean-up unnecessary sanity check.
authorAndrea Corallo <akrl@sdf.org>
Mon, 13 Apr 2020 15:57:27 +0000 (16:57 +0100)
committerAndrea Corallo <akrl@sdf.org>
Mon, 13 Apr 2020 17:10:03 +0000 (18:10 +0100)
'is_native_elisp' can't be non zero if NATIVE_COMP_FLAG is not set.

src/lread.c

index 9bd60b9b386db6fe88d0ec99c4c629397149ca0b..1e05ac69320cbba014b066ba21982784235627b7 100644 (file)
@@ -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
     {