aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAndrea Corallo2020-08-31 22:21:22 +0200
committerAndrea Corallo2020-08-31 22:40:47 +0200
commitba0a61d10a5aedaf4b7bb61aa3626f385d6aba12 (patch)
treea74ab519aea11f340c39068012150d5a24226f89 /src
parentc6f42387e32a4e99cd9ddd203ab51f3c5694054e (diff)
downloademacs-ba0a61d10a5aedaf4b7bb61aa3626f385d6aba12.tar.gz
emacs-ba0a61d10a5aedaf4b7bb61aa3626f385d6aba12.zip
* src/lread.c (Fload): Fix for manual eln load.
Diffstat (limited to 'src')
-rw-r--r--src/lread.c12
1 files changed, 9 insertions, 3 deletions
diff --git a/src/lread.c b/src/lread.c
index ac5b2838eef..80d36f571c2 100644
--- a/src/lread.c
+++ b/src/lread.c
@@ -1328,9 +1328,15 @@ Return t if the file exists and loads successfully. */)
1328 /* Reconstruct the .elc filename. */ 1328 /* Reconstruct the .elc filename. */
1329 Lisp_Object src_name = Fgethash (Ffile_name_nondirectory (found), 1329 Lisp_Object src_name = Fgethash (Ffile_name_nondirectory (found),
1330 Vcomp_eln_to_el_h, Qnil); 1330 Vcomp_eln_to_el_h, Qnil);
1331 if (suffix_p (src_name, "el.gz")) 1331 if (NILP (src_name))
1332 src_name = Fsubstring (src_name, make_fixnum (0), make_fixnum (-3)); 1332 /* Manual eln load. */
1333 found_for_hist = concat2 (src_name, build_string ("c")); 1333 found_for_hist = found;
1334 else
1335 {
1336 if (suffix_p (src_name, "el.gz"))
1337 src_name = Fsubstring (src_name, make_fixnum (0), make_fixnum (-3));
1338 found_for_hist = concat2 (src_name, build_string ("c"));
1339 }
1334 } 1340 }
1335 else 1341 else
1336 found_for_hist = found; 1342 found_for_hist = found;