/* This is used to build the load history. */
Lisp_Object Vcurrent_load_list;
+/* List of files that were preloaded. */
+Lisp_Object Vpreloaded_file_list;
+
/* Name of file actually being read by `load'. */
Lisp_Object Vload_file_name;
error ("Failure to create stdio stream for %s", XSTRING (file)->data);
}
+ if (! NILP (Vpurify_flag))
+ Vpreloaded_file_list = Fcons (file, Vpreloaded_file_list);
+
if (NILP (nomessage))
{
if (newer)
tem = oblookup (obarray, str, len);
if (SYMBOLP (tem))
return tem;
- return Fintern ((!NILP (Vpurify_flag)
- ? make_pure_string (str, len)
- : make_string (str, len)),
- obarray);
+ return Fintern (make_string (str, len), obarray);
}
/* Create an uninterned symbol with name STR. */
sym = Fmake_symbol (string);
XSYMBOL (sym)->obarray = obarray;
+ if (XSTRING (string)->data[0] == ':')
+ XSYMBOL (sym)->value = sym;
+
ptr = &XVECTOR (obarray)->contents[XINT (tem)];
if (SYMBOLP (*ptr))
XSYMBOL (sym)->next = XSYMBOL (*ptr);
Lisp dirs instead. */
Vload_path = nconc2 (Vload_path, dump_path);
+ /* Add leim under the installation dir, if it exists. */
+ tem = Fexpand_file_name (build_string ("leim"),
+ Vinstallation_directory);
+ tem1 = Ffile_exists_p (tem);
+ if (!NILP (tem1))
+ {
+ if (NILP (Fmember (tem, Vload_path)))
+ Vload_path = nconc2 (Vload_path, Fcons (tem, Qnil));
+ }
+
/* Add site-list under the installation dir, if it exists. */
tem = Fexpand_file_name (build_string ("site-lisp"),
Vinstallation_directory);
if (NILP (Fmember (tem, Vload_path)))
Vload_path = nconc2 (Vload_path, Fcons (tem, Qnil));
}
+
+ /* If Emacs was not built in the source directory,
+ and it is run from where it was built, add to load-path
+ the lisp, leim and site-lisp dirs under that directory. */
+
+ if (NILP (Fequal (Vinstallation_directory, Vsource_directory)))
+ {
+ tem = Fexpand_file_name (build_string ("src/Makefile"),
+ Vinstallation_directory);
+ tem1 = Ffile_exists_p (tem);
+ if (!NILP (tem1))
+ {
+ tem = Fexpand_file_name (build_string ("lisp"),
+ Vsource_directory);
+
+ if (NILP (Fmember (tem, Vload_path)))
+ Vload_path = nconc2 (Vload_path, Fcons (tem, Qnil));
+
+ tem = Fexpand_file_name (build_string ("leim"),
+ Vsource_directory);
+
+ if (NILP (Fmember (tem, Vload_path)))
+ Vload_path = nconc2 (Vload_path, Fcons (tem, Qnil));
+
+ tem = Fexpand_file_name (build_string ("site-lisp"),
+ Vsource_directory);
+
+ if (NILP (Fmember (tem, Vload_path)))
+ Vload_path = nconc2 (Vload_path, Fcons (tem, Qnil));
+ }
+ }
}
}
}
= Fexpand_file_name (build_string ("../"),
Fcar (decode_env_path (0, PATH_DUMPLOADSEARCH)));
+ DEFVAR_LISP ("preloaded-file-list", &Vpreloaded_file_list,
+ "List of files that were preloaded (when dumping Emacs).");
+ Vpreloaded_file_list = Qnil;
+
/* Vsource_directory was initialized in init_lread. */
load_descriptor_list = Qnil;