X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Fpackage-admin.el;h=d13a853b12297f4c4329e8296e0cbd9aeb62866e;hb=6986e39e1e0b14b565f08eae2241c710f7140598;hp=2f971ea966a33be4ad5a8484b7063f2b9498d3ec;hpb=98a6e4055a1fa624c592ac06f79287d55196ca37;p=chise%2Fxemacs-chise.git- diff --git a/lisp/package-admin.el b/lisp/package-admin.el index 2f971ea..d13a853 100644 --- a/lisp/package-admin.el +++ b/lisp/package-admin.el @@ -165,13 +165,13 @@ or return a location appropriate for the package otherwise." (featurep package-feature) (setq autoload-dir (feature-file package-feature)) (setq autoload-dir (file-name-directory autoload-dir)) - (member autoload-dir late-package-load-path)) + (member autoload-dir (append early-package-load-path late-package-load-path))) ;; Find the corresponding entry in late-package (setq pkg-dir (car-safe (member-if (lambda (h) (string-match (concat "^" (regexp-quote h)) autoload-dir)) - late-packages)))) + (append (cdr early-packages) late-packages))))) (if pkg-dir pkg-dir ;; Ok we need to guess