diff options
| author | Jim Blandy | 1992-04-24 08:11:54 +0000 |
|---|---|---|
| committer | Jim Blandy | 1992-04-24 08:11:54 +0000 |
| commit | 4746118aca2d5cbdd054b4af4814d56550dfbc79 (patch) | |
| tree | 370e07c6950794f936bc8d434cb0560d883e4a0b /src/lread.c | |
| parent | d4327fecc103493bc8275c3580b05c06c9fcc019 (diff) | |
| download | emacs-4746118aca2d5cbdd054b4af4814d56550dfbc79.tar.gz emacs-4746118aca2d5cbdd054b4af4814d56550dfbc79.zip | |
*** empty log message ***
Diffstat (limited to 'src/lread.c')
| -rw-r--r-- | src/lread.c | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/src/lread.c b/src/lread.c index 78d578758b0..c3157c8d618 100644 --- a/src/lread.c +++ b/src/lread.c | |||
| @@ -1448,14 +1448,15 @@ init_lread () | |||
| 1448 | uses ../lisp, instead of the path of the installed elisp | 1448 | uses ../lisp, instead of the path of the installed elisp |
| 1449 | libraries. However, if it appears that Vload_path was changed | 1449 | libraries. However, if it appears that Vload_path was changed |
| 1450 | from the default before dumping, don't override that value. */ | 1450 | from the default before dumping, don't override that value. */ |
| 1451 | { | 1451 | if (initialized) |
| 1452 | Lisp_Object normal_path; | 1452 | { |
| 1453 | 1453 | Lisp_Object dump_path; | |
| 1454 | normal_path = decode_env_path ("", normal); | ||
| 1455 | 1454 | ||
| 1456 | if ( | 1455 | dump_path = decode_env_path ("", PATH_DUMPLOADSEARCH); |
| 1457 | if (initialized | 1456 | if (! NILP (Fequal (dump_path, Vload_path))) |
| 1458 | || EQ (Vload_path, initial_path)) | 1457 | Vload_path = decode_env_path ("", normal); |
| 1458 | } | ||
| 1459 | else | ||
| 1459 | Vload_path = decode_env_path ("", normal); | 1460 | Vload_path = decode_env_path ("", normal); |
| 1460 | #endif | 1461 | #endif |
| 1461 | 1462 | ||
| @@ -1487,11 +1488,6 @@ init_lread () | |||
| 1487 | 1488 | ||
| 1488 | Vvalues = Qnil; | 1489 | Vvalues = Qnil; |
| 1489 | 1490 | ||
| 1490 | if (initialized) | ||
| 1491 | initial_path = Qnil; | ||
| 1492 | else | ||
| 1493 | initial_path = Vload_path; | ||
| 1494 | |||
| 1495 | load_in_progress = 0; | 1491 | load_in_progress = 0; |
| 1496 | } | 1492 | } |
| 1497 | 1493 | ||