diff options
| author | Andrea Corallo <akrl@sdf.org> | 2020-06-21 20:52:52 +0200 |
|---|---|---|
| committer | Andrea Corallo <akrl@sdf.org> | 2020-06-22 00:15:36 +0200 |
| commit | f0e9fdd1f9a9989b457cbc382e0cf12c161a8e6c (patch) | |
| tree | 0c83f17c37256e68f57a5a663a64b66dde97c55e /src | |
| parent | 0a70ed9df274f7b262862ddd08a2fd61e2fea42b (diff) | |
| download | emacs-f0e9fdd1f9a9989b457cbc382e0cf12c161a8e6c.tar.gz emacs-f0e9fdd1f9a9989b457cbc382e0cf12c161a8e6c.tar.bz2 emacs-f0e9fdd1f9a9989b457cbc382e0cf12c161a8e6c.zip | |
Two `load-history' eln related fixes.
* src/lread.c (Fload): Fix `load-history' filling for elns non in
root lisp-dir.
* lisp/startup.el (command-line): Fix `load-history' fixup
algorith for eln files.
Diffstat (limited to 'src')
| -rw-r--r-- | src/lread.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/lread.c b/src/lread.c index 0530848c2b7..f5a7d44a1e0 100644 --- a/src/lread.c +++ b/src/lread.c @@ -1506,7 +1506,8 @@ Return t if the file exists and loads successfully. */) specbind (Qcurrent_load_list, Qnil); if (!NILP (Vpurify_flag)) { - Lisp_Object base = parent_directory (Ffile_name_directory (found)); + Lisp_Object base = concat2 (parent_directory (Vinvocation_directory), + build_string ("lisp/")); Lisp_Object offset = Flength (base); hist_file_name = Fsubstring (found, offset, Qnil); } |