comparison lisp/prim/startup.el @ 6:27bc7f280385 r19-15b4

Import from CVS: tag r19-15b4
author cvs
date Mon, 13 Aug 2007 08:47:15 +0200
parents ac2d302a0011
children 49a24b4fd526
comparison
equal deleted inserted replaced
5:49b78a777eb4 6:27bc7f280385
1132 ;; the one that set-default-load-path-warning 1132 ;; the one that set-default-load-path-warning
1133 ;; will suggest. 1133 ;; will suggest.
1134 (file-name-as-directory 1134 (file-name-as-directory
1135 (expand-file-name "../xemacs/lock" root)) 1135 (expand-file-name "../xemacs/lock" root))
1136 ))))) 1136 )))))
1137
1138 ;; 1996/12/6 by MORIOKA Tomohiko <morioka@jaist.ac.jp>
1139 ;; define `default-load-path' for file-detect.el
1140 (setq default-load-path load-path)
1141
1137 ;; add site-lisp dir to load-path 1142 ;; add site-lisp dir to load-path
1138 (if site-lisp 1143 (if site-lisp
1139 (progn 1144 (progn
1140 ;; If the site-lisp dir isn't on the load-path, add it to the end. 1145 ;; If the site-lisp dir isn't on the load-path, add it to the end.
1141 (or (member site-lisp load-path) 1146 (or (member site-lisp load-path)
1172 (setq file (expand-file-name file lisp)) 1177 (setq file (expand-file-name file lisp))
1173 (not (member file load-path))) 1178 (not (member file load-path)))
1174 (setq load-path 1179 (setq load-path
1175 (nconc load-path 1180 (nconc load-path
1176 (list (file-name-as-directory file))))) 1181 (list (file-name-as-directory file)))))
1177 (setq files (cdr files)))) 1182 (setq files (cdr files))))))
1178 )) 1183
1184 ;; 1996/12/6 by MORIOKA Tomohiko <morioka@jaist.ac.jp>
1185 ;; define `default-load-path' for file-detect.el
1186 (setq default-load-path
1187 (append default-load-path
1188 (if site-lisp
1189 (list site-lisp))
1190 (if lisp
1191 (list lisp)
1192 )
1193 ))
1179 1194
1180 ;; If running from the build directory, always prefer the exec-directory 1195 ;; If running from the build directory, always prefer the exec-directory
1181 ;; that is here over the one that came from paths.h. 1196 ;; that is here over the one that came from paths.h.
1182 (if (or (and (null exec-directory) lib-src) 1197 (if (or (and (null exec-directory) lib-src)
1183 (and (equal lib-src (expand-file-name "lib-src" root)) 1198 (and (equal lib-src (expand-file-name "lib-src" root))