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.

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);
         }