diff options
| author | Karl Heuer | 1996-01-24 23:40:40 +0000 |
|---|---|---|
| committer | Karl Heuer | 1996-01-24 23:40:40 +0000 |
| commit | a90ba1e21696f9fa1ff7d6f8e166eeb5c488afba (patch) | |
| tree | ef0c5a9ce9dda69dc7ba3e4901dd6f4e88c5768a /src | |
| parent | e02500d4f5ca1240a6f5a6ce44652b13481ecdb1 (diff) | |
| download | emacs-a90ba1e21696f9fa1ff7d6f8e166eeb5c488afba.tar.gz emacs-a90ba1e21696f9fa1ff7d6f8e166eeb5c488afba.zip | |
(syms_of_lread): Set Vsource_directory here.
(init_lread): Not here.
Diffstat (limited to 'src')
| -rw-r--r-- | src/lread.c | 10 |
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 () | |||
| 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); |
| @@ -2424,7 +2421,12 @@ This is useful when the file being loaded is a temporary copy."); | |||
| 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 | ||