diff options
| author | Richard M. Stallman | 1995-04-08 20:58:37 +0000 |
|---|---|---|
| committer | Richard M. Stallman | 1995-04-08 20:58:37 +0000 |
| commit | c478f98c692d4d43860da2836352d81c0beca5a7 (patch) | |
| tree | 94f7d6147ed0bf07f5115e9a9291a8cf7a62cd84 /src | |
| parent | af37b2e6950973c1c6b2c9a594f912ccc3932679 (diff) | |
| download | emacs-c478f98c692d4d43860da2836352d81c0beca5a7.tar.gz emacs-c478f98c692d4d43860da2836352d81c0beca5a7.zip | |
(read_escape): Undo Nov 15 change.
(init_lread): Add site-lisp under the installation dir
to Vload_path if that exists.
Diffstat (limited to 'src')
| -rw-r--r-- | src/lread.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/src/lread.c b/src/lread.c index b7c1706cb8e..57231df36e6 100644 --- a/src/lread.c +++ b/src/lread.c | |||
| @@ -1004,8 +1004,6 @@ read_escape (readcharfun) | |||
| 1004 | c = READCHAR; | 1004 | c = READCHAR; |
| 1005 | if (c == '\\') | 1005 | if (c == '\\') |
| 1006 | c = read_escape (readcharfun); | 1006 | c = read_escape (readcharfun); |
| 1007 | if ((c & 0xff) >= 'a' && (c & 0xff) <= 'z') | ||
| 1008 | return c - ('a' - 'A'); | ||
| 1009 | return c | shift_modifier; | 1007 | return c | shift_modifier; |
| 1010 | 1008 | ||
| 1011 | case 'H': | 1009 | case 'H': |
| @@ -2046,6 +2044,16 @@ init_lread () | |||
| 2046 | /* That dir doesn't exist, so add the build-time | 2044 | /* That dir doesn't exist, so add the build-time |
| 2047 | Lisp dirs instead. */ | 2045 | Lisp dirs instead. */ |
| 2048 | Vload_path = nconc2 (Vload_path, dump_path); | 2046 | Vload_path = nconc2 (Vload_path, dump_path); |
| 2047 | |||
| 2048 | /* Add site-list under the installation dir, if it exists. */ | ||
| 2049 | tem = Fexpand_file_name (build_string ("site-lisp"), | ||
| 2050 | Vinstallation_directory); | ||
| 2051 | tem1 = Ffile_exists_p (tem); | ||
| 2052 | if (!NILP (tem1)) | ||
| 2053 | { | ||
| 2054 | if (NILP (Fmember (tem, Vload_path))) | ||
| 2055 | Vload_path = nconc2 (Vload_path, Fcons (tem, Qnil)); | ||
| 2056 | } | ||
| 2049 | } | 2057 | } |
| 2050 | } | 2058 | } |
| 2051 | } | 2059 | } |