summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Heuer <kwzh@gnu.org>1996-01-24 23:40:40 +0000
committerKarl Heuer <kwzh@gnu.org>1996-01-24 23:40:40 +0000
commita90ba1e21696f9fa1ff7d6f8e166eeb5c488afba (patch)
treeef0c5a9ce9dda69dc7ba3e4901dd6f4e88c5768a
parente02500d4f5ca1240a6f5a6ce44652b13481ecdb1 (diff)
downloademacs-a90ba1e21696f9fa1ff7d6f8e166eeb5c488afba.tar.gz
(syms_of_lread): Set Vsource_directory here.
(init_lread): Not here.
-rw-r--r--src/lread.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/src/lread.c b/src/lread.c
index 4b36678e89c..90e3b2acf56 100644
--- a/src/lread.c
+++ b/src/lread.c
@@ -2249,9 +2249,6 @@ init_lread ()
from the default before dumping, don't override that value. */
if (initialized)
{
- Vsource_directory = Fexpand_file_name (build_string ("../"),
- Fcar (Fcdr (dump_path)));
-
if (! NILP (Fequal (dump_path, Vload_path)))
{
Vload_path = decode_env_path (0, normal);
@@ -2424,7 +2421,12 @@ This is useful when the file being loaded is a temporary copy.");
DEFVAR_LISP ("source-directory", &Vsource_directory,
"Directory in which Emacs sources were found when Emacs was built.\n\
You cannot count on them to still be there!");
- Vsource_directory = Qnil;
+ Vsource_directory
+ = Fexpand_file_name (build_string ("../"),
+ Fcar (decode_env_path (0, PATH_DUMPLOADSEARCH)));
+
+ /* Vsource_directory was initialized in init_lread. */
+
load_descriptor_list = Qnil;
staticpro (&load_descriptor_list);