comparison src/lread.c @ 14300:f777822a5d81

(syms_of_lread): Set Vsource_directory here. (init_lread): Not here.
author Karl Heuer <kwzh@gnu.org>
date Wed, 24 Jan 1996 23:40:40 +0000
parents ee40177f6c68
children 7f49c41db1e8
comparison
equal deleted inserted replaced
14299:037a89c9d068 14300:f777822a5d81
2247 uses ../lisp, instead of the path of the installed elisp 2247 uses ../lisp, instead of the path of the installed elisp
2248 libraries. However, if it appears that Vload_path was changed 2248 libraries. However, if it appears that Vload_path was changed
2249 from the default before dumping, don't override that value. */ 2249 from the default before dumping, don't override that value. */
2250 if (initialized) 2250 if (initialized)
2251 { 2251 {
2252 Vsource_directory = Fexpand_file_name (build_string ("../"),
2253 Fcar (Fcdr (dump_path)));
2254
2255 if (! NILP (Fequal (dump_path, Vload_path))) 2252 if (! NILP (Fequal (dump_path, Vload_path)))
2256 { 2253 {
2257 Vload_path = decode_env_path (0, normal); 2254 Vload_path = decode_env_path (0, normal);
2258 if (!NILP (Vinstallation_directory)) 2255 if (!NILP (Vinstallation_directory))
2259 { 2256 {
2422 load_force_doc_strings = 0; 2419 load_force_doc_strings = 0;
2423 2420
2424 DEFVAR_LISP ("source-directory", &Vsource_directory, 2421 DEFVAR_LISP ("source-directory", &Vsource_directory,
2425 "Directory in which Emacs sources were found when Emacs was built.\n\ 2422 "Directory in which Emacs sources were found when Emacs was built.\n\
2426 You cannot count on them to still be there!"); 2423 You cannot count on them to still be there!");
2427 Vsource_directory = Qnil; 2424 Vsource_directory
2425 = Fexpand_file_name (build_string ("../"),
2426 Fcar (decode_env_path (0, PATH_DUMPLOADSEARCH)));
2427
2428 /* Vsource_directory was initialized in init_lread. */
2429
2428 load_descriptor_list = Qnil; 2430 load_descriptor_list = Qnil;
2429 staticpro (&load_descriptor_list); 2431 staticpro (&load_descriptor_list);
2430 2432
2431 Qcurrent_load_list = intern ("current-load-list"); 2433 Qcurrent_load_list = intern ("current-load-list");
2432 staticpro (&Qcurrent_load_list); 2434 staticpro (&Qcurrent_load_list);