Mercurial > hg > xemacs-beta
comparison lisp/package-admin.el @ 367:a4f53d9b3154 r21-1-13
Import from CVS: tag r21-1-13
author | cvs |
---|---|
date | Mon, 13 Aug 2007 11:01:07 +0200 |
parents | 4f79e16b1112 |
children | cc15677e0335 |
comparison
equal
deleted
inserted
replaced
366:83d76f480a59 | 367:a4f53d9b3154 |
---|---|
163 autoload-dir) | 163 autoload-dir) |
164 (when (and (not (eq package 'unknown)) | 164 (when (and (not (eq package 'unknown)) |
165 (featurep package-feature) | 165 (featurep package-feature) |
166 (setq autoload-dir (feature-file package-feature)) | 166 (setq autoload-dir (feature-file package-feature)) |
167 (setq autoload-dir (file-name-directory autoload-dir)) | 167 (setq autoload-dir (file-name-directory autoload-dir)) |
168 (member autoload-dir late-package-load-path)) | 168 (member autoload-dir (append early-package-load-path late-package-load-path))) |
169 ;; Find the corresonding entry in late-package | 169 ;; Find the corresonding entry in late-package |
170 (setq pkg-dir | 170 (setq pkg-dir |
171 (car-safe (member-if (lambda (h) | 171 (car-safe (member-if (lambda (h) |
172 (string-match (concat "^" (regexp-quote h)) | 172 (string-match (concat "^" (regexp-quote h)) |
173 autoload-dir)) | 173 autoload-dir)) |
174 late-packages)))) | 174 (append (cdr early-packages) late-packages))))) |
175 (if pkg-dir | 175 (if pkg-dir |
176 pkg-dir | 176 pkg-dir |
177 ;; Ok we need to guess | 177 ;; Ok we need to guess |
178 (if mule-related | 178 (if mule-related |
179 (package-admin-get-install-dir 'mule-base nil nil) | 179 (package-admin-get-install-dir 'mule-base nil nil) |