diff options
| author | Richard M. Stallman | 1997-07-02 06:20:12 +0000 |
|---|---|---|
| committer | Richard M. Stallman | 1997-07-02 06:20:12 +0000 |
| commit | 9fbc011645bf22b2d8907f8d824778af326fc11f (patch) | |
| tree | 866df268552418964326d195821586e5b41ced7d /src | |
| parent | 8da035d01b6cac2d75b5e936a3d67a025aff7b47 (diff) | |
| download | emacs-9fbc011645bf22b2d8907f8d824778af326fc11f.tar.gz emacs-9fbc011645bf22b2d8907f8d824778af326fc11f.zip | |
(init_lread): Add leim subdir, like lisp subdir.
Diffstat (limited to 'src')
| -rw-r--r-- | src/lread.c | 21 |
1 files changed, 18 insertions, 3 deletions
diff --git a/src/lread.c b/src/lread.c index 12482552cd3..fb4d7554f92 100644 --- a/src/lread.c +++ b/src/lread.c | |||
| @@ -2502,6 +2502,16 @@ init_lread () | |||
| 2502 | Lisp dirs instead. */ | 2502 | Lisp dirs instead. */ |
| 2503 | Vload_path = nconc2 (Vload_path, dump_path); | 2503 | Vload_path = nconc2 (Vload_path, dump_path); |
| 2504 | 2504 | ||
| 2505 | /* Add leim under the installation dir, if it exists. */ | ||
| 2506 | tem = Fexpand_file_name (build_string ("leim"), | ||
| 2507 | Vinstallation_directory); | ||
| 2508 | tem1 = Ffile_exists_p (tem); | ||
| 2509 | if (!NILP (tem1)) | ||
| 2510 | { | ||
| 2511 | if (NILP (Fmember (tem, Vload_path))) | ||
| 2512 | Vload_path = nconc2 (Vload_path, Fcons (tem, Qnil)); | ||
| 2513 | } | ||
| 2514 | |||
| 2505 | /* Add site-list under the installation dir, if it exists. */ | 2515 | /* Add site-list under the installation dir, if it exists. */ |
| 2506 | tem = Fexpand_file_name (build_string ("site-lisp"), | 2516 | tem = Fexpand_file_name (build_string ("site-lisp"), |
| 2507 | Vinstallation_directory); | 2517 | Vinstallation_directory); |
| @@ -2513,9 +2523,8 @@ init_lread () | |||
| 2513 | } | 2523 | } |
| 2514 | 2524 | ||
| 2515 | /* If Emacs was not built in the source directory, | 2525 | /* If Emacs was not built in the source directory, |
| 2516 | and it is run from where it was built, | 2526 | and it is run from where it was built, add to load-path |
| 2517 | add to load-path | 2527 | the lisp, leim and site-lisp dirs under that directory. */ |
| 2518 | the lisp and site-lisp dirs under the source directory. */ | ||
| 2519 | 2528 | ||
| 2520 | if (NILP (Fequal (Vinstallation_directory, Vsource_directory))) | 2529 | if (NILP (Fequal (Vinstallation_directory, Vsource_directory))) |
| 2521 | { | 2530 | { |
| @@ -2530,6 +2539,12 @@ init_lread () | |||
| 2530 | if (NILP (Fmember (tem, Vload_path))) | 2539 | if (NILP (Fmember (tem, Vload_path))) |
| 2531 | Vload_path = nconc2 (Vload_path, Fcons (tem, Qnil)); | 2540 | Vload_path = nconc2 (Vload_path, Fcons (tem, Qnil)); |
| 2532 | 2541 | ||
| 2542 | tem = Fexpand_file_name (build_string ("leim"), | ||
| 2543 | Vsource_directory); | ||
| 2544 | |||
| 2545 | if (NILP (Fmember (tem, Vload_path))) | ||
| 2546 | Vload_path = nconc2 (Vload_path, Fcons (tem, Qnil)); | ||
| 2547 | |||
| 2533 | tem = Fexpand_file_name (build_string ("site-lisp"), | 2548 | tem = Fexpand_file_name (build_string ("site-lisp"), |
| 2534 | Vsource_directory); | 2549 | Vsource_directory); |
| 2535 | 2550 | ||