3359 |
Vload_path = decode_env_path (0, normal); |
Vload_path = decode_env_path (0, normal); |
3360 |
if (!NILP (Vinstallation_directory)) |
if (!NILP (Vinstallation_directory)) |
3361 |
{ |
{ |
3362 |
|
Lisp_Object tem, tem1, sitelisp; |
3363 |
|
|
3364 |
|
/* Remove site-lisp dirs from path temporarily and store |
3365 |
|
them in sitelisp, then conc them on at the end so |
3366 |
|
they're always first in path. */ |
3367 |
|
sitelisp = Qnil; |
3368 |
|
while (1) |
3369 |
|
{ |
3370 |
|
tem = Fcar (Vload_path); |
3371 |
|
tem1 = Fstring_match (build_string ("site-lisp"), |
3372 |
|
tem, Qnil); |
3373 |
|
if (!NILP (tem1)) |
3374 |
|
{ |
3375 |
|
Vload_path = Fcdr (Vload_path); |
3376 |
|
sitelisp = Fcons (tem, sitelisp); |
3377 |
|
} |
3378 |
|
else |
3379 |
|
break; |
3380 |
|
} |
3381 |
|
|
3382 |
/* Add to the path the lisp subdir of the |
/* Add to the path the lisp subdir of the |
3383 |
installation dir, if it exists. */ |
installation dir, if it exists. */ |
|
Lisp_Object tem, tem1; |
|
3384 |
tem = Fexpand_file_name (build_string ("lisp"), |
tem = Fexpand_file_name (build_string ("lisp"), |
3385 |
Vinstallation_directory); |
Vinstallation_directory); |
3386 |
tem1 = Ffile_exists_p (tem); |
tem1 = Ffile_exists_p (tem); |
3389 |
if (NILP (Fmember (tem, Vload_path))) |
if (NILP (Fmember (tem, Vload_path))) |
3390 |
{ |
{ |
3391 |
turn_off_warning = 1; |
turn_off_warning = 1; |
3392 |
Vload_path = nconc2 (Vload_path, Fcons (tem, Qnil)); |
Vload_path = Fcons (tem, Vload_path); |
3393 |
} |
} |
3394 |
} |
} |
3395 |
else |
else |
3404 |
if (!NILP (tem1)) |
if (!NILP (tem1)) |
3405 |
{ |
{ |
3406 |
if (NILP (Fmember (tem, Vload_path))) |
if (NILP (Fmember (tem, Vload_path))) |
3407 |
Vload_path = nconc2 (Vload_path, Fcons (tem, Qnil)); |
Vload_path = Fcons (tem, Vload_path); |
3408 |
} |
} |
3409 |
|
|
3410 |
/* Add site-list under the installation dir, if it exists. */ |
/* Add site-list under the installation dir, if it exists. */ |
3414 |
if (!NILP (tem1)) |
if (!NILP (tem1)) |
3415 |
{ |
{ |
3416 |
if (NILP (Fmember (tem, Vload_path))) |
if (NILP (Fmember (tem, Vload_path))) |
3417 |
Vload_path = nconc2 (Vload_path, Fcons (tem, Qnil)); |
Vload_path = Fcons (tem, Vload_path); |
3418 |
} |
} |
3419 |
|
|
3420 |
/* If Emacs was not built in the source directory, |
/* If Emacs was not built in the source directory, |
3442 |
Vsource_directory); |
Vsource_directory); |
3443 |
|
|
3444 |
if (NILP (Fmember (tem, Vload_path))) |
if (NILP (Fmember (tem, Vload_path))) |
3445 |
Vload_path = nconc2 (Vload_path, Fcons (tem, Qnil)); |
Vload_path = Fcons (tem, Vload_path); |
3446 |
|
|
3447 |
tem = Fexpand_file_name (build_string ("leim"), |
tem = Fexpand_file_name (build_string ("leim"), |
3448 |
Vsource_directory); |
Vsource_directory); |
3449 |
|
|
3450 |
if (NILP (Fmember (tem, Vload_path))) |
if (NILP (Fmember (tem, Vload_path))) |
3451 |
Vload_path = nconc2 (Vload_path, Fcons (tem, Qnil)); |
Vload_path = Fcons (tem, Vload_path); |
3452 |
|
|
3453 |
tem = Fexpand_file_name (build_string ("site-lisp"), |
tem = Fexpand_file_name (build_string ("site-lisp"), |
3454 |
Vsource_directory); |
Vsource_directory); |
3455 |
|
|
3456 |
if (NILP (Fmember (tem, Vload_path))) |
if (NILP (Fmember (tem, Vload_path))) |
3457 |
Vload_path = nconc2 (Vload_path, Fcons (tem, Qnil)); |
Vload_path = Fcons (tem, Vload_path); |
3458 |
} |
} |
3459 |
} |
} |
3460 |
|
if (!NILP (sitelisp)) |
3461 |
|
Vload_path = nconc2 (Fnreverse (sitelisp), Vload_path); |
3462 |
} |
} |
3463 |
} |
} |
3464 |
} |
} |