diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/lread.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/lread.c b/src/lread.c index 157a392a158..fdbf0329118 100644 --- a/src/lread.c +++ b/src/lread.c | |||
| @@ -4271,7 +4271,9 @@ load_path_check (Lisp_Object lpath) | |||
| 4271 | are running uninstalled. | 4271 | are running uninstalled. |
| 4272 | 4272 | ||
| 4273 | Uses the following logic: | 4273 | Uses the following logic: |
| 4274 | If CANNOT_DUMP: Use PATH_LOADSEARCH. | 4274 | If CANNOT_DUMP: |
| 4275 | If Vinstallation_directory is not nil (ie, running uninstalled), | ||
| 4276 | use PATH_DUMPLOADSEARCH (ie, build path). Else use PATH_LOADSEARCH. | ||
| 4275 | The remainder is what happens when dumping works: | 4277 | The remainder is what happens when dumping works: |
| 4276 | If purify-flag (ie dumping) just use PATH_DUMPLOADSEARCH. | 4278 | If purify-flag (ie dumping) just use PATH_DUMPLOADSEARCH. |
| 4277 | Otherwise use PATH_LOADSEARCH. | 4279 | Otherwise use PATH_LOADSEARCH. |
| @@ -4305,6 +4307,8 @@ load_path_default (void) | |||
| 4305 | #endif | 4307 | #endif |
| 4306 | 4308 | ||
| 4307 | normal = PATH_LOADSEARCH; | 4309 | normal = PATH_LOADSEARCH; |
| 4310 | if (!NILP (Vinstallation_directory)) normal = PATH_DUMPLOADSEARCH; | ||
| 4311 | |||
| 4308 | #ifdef HAVE_NS | 4312 | #ifdef HAVE_NS |
| 4309 | lpath = decode_env_path (0, loadpath ? loadpath : normal, 0); | 4313 | lpath = decode_env_path (0, loadpath ? loadpath : normal, 0); |
| 4310 | #else | 4314 | #else |