comparison lisp/packages.el @ 243:f220cc83d72e r20-5b20

Import from CVS: tag r20-5b20
author cvs
date Mon, 13 Aug 2007 10:17:07 +0200
parents 41f2f0e326e9
children e70b3a057e12
comparison
equal deleted inserted replaced
242:fc816b73a05f 243:f220cc83d72e
250 ;; The following function is called from temacs 250 ;; The following function is called from temacs
251 (defun packages-find-packages-1 (package path-only append-p user-package) 251 (defun packages-find-packages-1 (package path-only append-p user-package)
252 "Search the supplied directory for associated directories. 252 "Search the supplied directory for associated directories.
253 The top level is assumed to look like: 253 The top level is assumed to look like:
254 info/ Contain texinfo files for lisp installed in this hierarchy 254 info/ Contain texinfo files for lisp installed in this hierarchy
255 etc/ Contain data files for lisp installled in this hiearchy 255 etc/ Contain data files for lisp installled in this hierarchy
256 lisp/ Contain directories which either have straight lisp code 256 lisp/ Contain directories which either have straight lisp code
257 or are self-contained packages of their own. 257 or are self-contained packages of their own.
258 258
259 If the argument `append-p' is non-nil, the found directories will be 259 If the argument `append-p' is non-nil, the found directories will be
260 appended to the paths, otherwise, they will be prepended. 260 appended to the paths, otherwise, they will be prepended.
285 285
286 ;; Locate and process a dumped-lisp.el file if it exists 286 ;; Locate and process a dumped-lisp.el file if it exists
287 (if (and (running-temacs-p) 287 (if (and (running-temacs-p)
288 (file-exists-p (concat package "/lisp/dumped-lisp.el"))) 288 (file-exists-p (concat package "/lisp/dumped-lisp.el")))
289 (let (package-lisp) 289 (let (package-lisp)
290 (load (concat package "/lisp/dumped-lisp.el")) 290 (let (preloaded-file-list)
291 (load (concat package "/lisp/dumped-lisp.el")))
291 (if package-lisp 292 (if package-lisp
292 (progn 293 (progn
293 (if (boundp 'preloaded-file-list) 294 (if (boundp 'preloaded-file-list)
294 (setq preloaded-file-list 295 (setq preloaded-file-list
295 (append preloaded-file-list package-lisp))) 296 (append preloaded-file-list package-lisp)))