Mercurial > hg > xemacs-beta

comparison lisp/startup.el @ 227:0e522484dd2a r20-5b12

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Import from CVS: tag r20-5b12
author cvs
date Mon, 13 Aug 2007 10:12:37 +0200
parents d44af0c54775
children 85a06df23a9a
comparison
equal deleted inserted replaced
226:eea38c7ad7b4 227:0e522484dd2a
1215 1215
1216 ;; add site-lisp dir to load-path 1216 ;; add site-lisp dir to load-path
1217 (when site-lisp 1217 (when site-lisp
1218 ;; If the site-lisp dir isn't on the load-path, add it to the end. 1218 ;; If the site-lisp dir isn't on the load-path, add it to the end.
1219 (or (member site-lisp load-path) 1219 (or (member site-lisp load-path)
1220 (setq load-path (append load-path (list site-lisp)))) 1220 (setq load-path (append load-path
1221 (list (file-name-as-directory site-lisp)))))
1221 ;; Also add any direct subdirectories of the site-lisp directory 1222 ;; Also add any direct subdirectories of the site-lisp directory
1222 ;; to the load-path. But don't add dirs whose names begin 1223 ;; to the load-path. But don't add dirs whose names begin
1223 ;; with dot or hyphen. 1224 ;; with dot or hyphen.
1224 (let ((files (directory-files site-lisp nil "^[^-.]" nil 'dirs-only)) 1225 (let ((files (directory-files site-lisp nil "^[^-.]" nil 'dirs-only))
1225 file) 1226 file)
1235 1236
1236 ;; add lisp dir to load-path 1237 ;; add lisp dir to load-path
1237 (when lisp 1238 (when lisp
1238 ;; If the lisp dir isn't on the load-path, add it to the end. 1239 ;; If the lisp dir isn't on the load-path, add it to the end.
1239 (or (member lisp load-path) 1240 (or (member lisp load-path)
1240 (setq load-path (append load-path (list lisp)))) 1241 (setq load-path (append load-path
1242 (list (file-name-as-directory lisp)))))
1241 ;; Also add any direct subdirectories of the lisp directory 1243 ;; Also add any direct subdirectories of the lisp directory
1242 ;; to the load-path. But don't add dirs whose names begin 1244 ;; to the load-path. But don't add dirs whose names begin
1243 ;; with dot or hyphen. 1245 ;; with dot or hyphen.
1244 (let ((files (directory-files lisp nil "^[^-.]" nil 'dirs-only)) 1246 (let ((files (directory-files lisp nil "^[^-.]" nil 'dirs-only))
1245 file) 1247 file)
1330 (setq superlock-file 1332 (setq superlock-file
1331 (expand-file-name "!!!SuperLock!!!" 1333 (expand-file-name "!!!SuperLock!!!"
1332 lock-directory))))) 1334 lock-directory)))))
1333 1335
1334 (set-default-load-path-warning) 1336 (set-default-load-path-warning)
1335 (when (and data-directory Info-default-directory-list) 1337 (when (and (null (running-temacs-p))
1338 data-directory
1339 Info-default-directory-list)
1336 (setq data-directory-list (list data-directory)) 1340 (setq data-directory-list (list data-directory))
1337 (packages-find-packages package-path nil)))) 1341 (packages-find-packages package-path nil))))
1338 1342
1339 1343
1340 (defun set-default-load-path-warning () 1344 (defun set-default-load-path-warning ()