]>
Commit | Line | Data |
---|---|---|
f7ced9a1 SZ |
1 | diff -Naur jed-B0.99-13/lib/site.sl jed-B0.99-13-p/lib/site.sl |
2 | --- jed-B0.99-13/lib/site.sl Mon Feb 19 19:33:19 2001 | |
3 | +++ jed-B0.99-13-p/lib/site.sl Thu Feb 22 09:35:05 2001 | |
4 | @@ -2772,14 +2772,6 @@ | |
5 | #ifdef VMS | |
6 | init_file = "SYS$LOGIN:"; | |
7 | if (NULL != getenv("JED_HOME")) init_file = "JED_HOME:"; | |
4c08d6ce | 8 | -#else |
f7ced9a1 SZ |
9 | - init_file = getenv ("JED_HOME"); |
10 | - if (init_file == NULL) | |
11 | - { | |
12 | - init_file = getenv("HOME"); | |
13 | - if (init_file == NULL) init_file = ""; | |
14 | - } | |
15 | -#endif | |
16 | init_file = dircat (init_file, | |
17 | #ifdef UNIX | |
18 | ".jedrc" | |
19 | @@ -2788,6 +2780,33 @@ | |
4c08d6ce | 20 | #endif |
f7ced9a1 | 21 | ); |
4c08d6ce | 22 | |
f7ced9a1 SZ |
23 | +#else |
24 | + init_file = getenv ("JED_HOME"); | |
25 | + if (init_file == NULL) { | |
26 | + init_file = getenv("CONFIG_DIR"); | |
27 | + if (init_file == NULL) { | |
28 | + init_file = getenv("HOME"); | |
29 | + if (init_file == NULL) | |
30 | + init_file = ""; | |
31 | + | |
32 | + init_file = dircat (init_file, | |
33 | +#ifdef UNIX | |
34 | + ".jedrc" | |
35 | +#else | |
36 | + "jed.rc" | |
37 | +#endif | |
38 | + ); | |
39 | + } else { | |
40 | + if (strncmp(getenv("CONFIG_DIR"), "/",0)) | |
41 | + init_file = sprintf("%s/jed",getenv("CONFIG_DIR")); | |
42 | + else | |
43 | + init_file = sprintf("%s/%s/jed",getenv("HOME"), | |
44 | + getenv("CONFIG_DIR")); | |
45 | + init_file = dircat (file,"jedrc"); | |
46 | + } | |
47 | + } | |
48 | + | |
49 | +#endif | |
50 | % if first argument is -n then do NOT load init file | |
51 | while (n) | |
52 | { |