Mercurial > hg > xemacs-beta
comparison lisp/prim/startup.el @ 72:b9518feda344 r20-0b31
Import from CVS: tag r20-0b31
author | cvs |
---|---|
date | Mon, 13 Aug 2007 09:03:46 +0200 |
parents | 131b0175ea99 |
children | c0c698873ce1 |
comparison
equal
deleted
inserted
replaced
71:bae944334fa4 | 72:b9518feda344 |
---|---|
1127 ;; the one that set-default-load-path-warning | 1127 ;; the one that set-default-load-path-warning |
1128 ;; will suggest. | 1128 ;; will suggest. |
1129 (file-name-as-directory | 1129 (file-name-as-directory |
1130 (expand-file-name "../xemacs/lock" root)) | 1130 (expand-file-name "../xemacs/lock" root)) |
1131 ))))) | 1131 ))))) |
1132 | |
1133 ;; 1996/12/6 by MORIOKA Tomohiko <morioka@jaist.ac.jp> | |
1134 ;; define `default-load-path' for file-detect.el | |
1135 (setq default-load-path load-path) | |
1136 | |
1132 ;; add site-lisp dir to load-path | 1137 ;; add site-lisp dir to load-path |
1133 (when site-lisp | 1138 (when site-lisp |
1134 ;; If the site-lisp dir isn't on the load-path, add it to the end. | 1139 ;; If the site-lisp dir isn't on the load-path, add it to the end. |
1135 (or (member site-lisp load-path) | 1140 (or (member site-lisp load-path) |
1136 (setq load-path (append load-path (list site-lisp)))) | 1141 (setq load-path (append load-path (list site-lisp)))) |
1167 (setq load-path | 1172 (setq load-path |
1168 (nconc load-path | 1173 (nconc load-path |
1169 (list (file-name-as-directory file))))) | 1174 (list (file-name-as-directory file))))) |
1170 (setq files (cdr files))))) | 1175 (setq files (cdr files))))) |
1171 | 1176 |
1177 ;; 1996/12/6 by MORIOKA Tomohiko <morioka@jaist.ac.jp> | |
1178 ;; define `default-load-path' for file-detect.el | |
1179 (setq default-load-path | |
1180 (append default-load-path | |
1181 (if site-lisp | |
1182 (list site-lisp)) | |
1183 (if lisp | |
1184 (list lisp) | |
1185 ) | |
1186 )) | |
1187 | |
1172 ;; If running from the build directory, always prefer the exec-directory | 1188 ;; If running from the build directory, always prefer the exec-directory |
1173 ;; that is here over to the one that came from paths.h. | 1189 ;; that is here over to the one that came from paths.h. |
1174 (when (or (and (null exec-directory) lib-src) | 1190 (when (or (and (null exec-directory) lib-src) |
1175 (and (string= lib-src (expand-file-name "lib-src" root)) | 1191 (and (string= lib-src (expand-file-name "lib-src" root)) |
1176 (not (string= exec-directory lib-src)))) | 1192 (not (string= exec-directory lib-src)))) |