diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2022-02-19 14:12:14 -0500 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2022-02-19 14:12:14 -0500 |
| commit | c3e064013ee81b0dac5475cc3450209d637cf3b4 (patch) | |
| tree | bb156ac90ca9418e9af19035491bab7f411c8fe6 /src/lread.c | |
| parent | 910cdcf8c3939b84f0eaeb178119dd32f867411d (diff) | |
| download | emacs-c3e064013ee81b0dac5475cc3450209d637cf3b4.tar.gz emacs-c3e064013ee81b0dac5475cc3450209d637cf3b4.tar.bz2 emacs-c3e064013ee81b0dac5475cc3450209d637cf3b4.zip | |
(loadhist_initialize): Minor refactoring
Consolidate a bit of code.
* src/lread.c (loadhist_initialize): New function.
(Fload, readevalloop): Use it.
Diffstat (limited to 'src/lread.c')
| -rw-r--r-- | src/lread.c | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/src/lread.c b/src/lread.c index 58b40ef37e3..d225403b203 100644 --- a/src/lread.c +++ b/src/lread.c @@ -1169,6 +1169,13 @@ compute_found_effective (Lisp_Object found) return concat2 (src_name, build_string ("c")); } +static void +loadhist_initialize (Lisp_Object filename) +{ + eassert (STRINGP (filename)); + specbind (Qcurrent_load_list, Fcons (filename, Qnil)); +} + DEFUN ("load", Fload, Sload, 1, 5, 0, doc: /* Execute a file of Lisp code named FILE. First try FILE with `.elc' appended, then try with `.el', then try @@ -1552,8 +1559,7 @@ Return t if the file exists and loads successfully. */) if (is_module) { #ifdef HAVE_MODULES - specbind (Qcurrent_load_list, Qnil); - LOADHIST_ATTACH (found); + loadhist_initialize (found); Fmodule_load (found); build_load_history (found, true); #else @@ -1564,8 +1570,7 @@ Return t if the file exists and loads successfully. */) else if (is_native_elisp) { #ifdef HAVE_NATIVE_COMP - specbind (Qcurrent_load_list, Qnil); - LOADHIST_ATTACH (hist_file_name); + loadhist_initialize (hist_file_name); Fnative_elisp_load (found, Qnil); build_load_history (hist_file_name, true); #else @@ -2197,7 +2202,6 @@ readevalloop (Lisp_Object readcharfun, emacs_abort (); specbind (Qstandard_input, readcharfun); - specbind (Qcurrent_load_list, Qnil); record_unwind_protect_int (readevalloop_1, load_convert_to_unibyte); load_convert_to_unibyte = !NILP (unibyte); @@ -2215,7 +2219,7 @@ readevalloop (Lisp_Object readcharfun, && !NILP (sourcename) && !NILP (Ffile_name_absolute_p (sourcename))) sourcename = Fexpand_file_name (sourcename, Qnil); - LOADHIST_ATTACH (sourcename); + loadhist_initialize (sourcename); continue_reading_p = 1; while (continue_reading_p) |