emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

feature/native-comp ba0a61d 2/2: * src/lread.c (Fload): Fix for manual e


From: Andrea Corallo
Subject: feature/native-comp ba0a61d 2/2: * src/lread.c (Fload): Fix for manual eln load.
Date: Mon, 31 Aug 2020 16:42:30 -0400 (EDT)

branch: feature/native-comp
commit ba0a61d10a5aedaf4b7bb61aa3626f385d6aba12
Author: Andrea Corallo <akrl@sdf.org>
Commit: Andrea Corallo <akrl@sdf.org>

    * src/lread.c (Fload): Fix for manual eln load.
---
 src/lread.c | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/lread.c b/src/lread.c
index ac5b283..80d36f5 100644
--- a/src/lread.c
+++ b/src/lread.c
@@ -1328,9 +1328,15 @@ Return t if the file exists and loads successfully.  */)
       /* Reconstruct the .elc filename.  */
       Lisp_Object src_name = Fgethash (Ffile_name_nondirectory (found),
                                       Vcomp_eln_to_el_h, Qnil);
-      if (suffix_p (src_name, "el.gz"))
-       src_name = Fsubstring (src_name, make_fixnum (0), make_fixnum (-3));
-      found_for_hist = concat2 (src_name, build_string ("c"));
+      if (NILP (src_name))
+       /* Manual eln load.  */
+       found_for_hist = found;
+      else
+       {
+         if (suffix_p (src_name, "el.gz"))
+           src_name = Fsubstring (src_name, make_fixnum (0), make_fixnum (-3));
+         found_for_hist = concat2 (src_name, build_string ("c"));
+       }
     }
   else
     found_for_hist = found;



reply via email to

[Prev in Thread] Current Thread [Next in Thread]