# HG changeset patch
# User michaels
# Date 1007631350 0
# Node ID 6a0eecc6df0e7b2b8cbbdb716ec9be37e630c9fb
# Parent  c9d38610941f8ed194d1d3e1fcf4eb18a5ad4ca8
[xemacs-hg @ 2001-12-06 09:35:50 by michaels]
2001-12-05  Michael Sperber [Mr. Preprocessor]  <sperber@informatik.uni-tuebingen.de>

	* packages.el (packages-compute-package-locations): Add
	user-specific site-packages and infodock-packages hierarchies for
	symmetry.

	* find-paths.el (paths-emacs-root-p): Use version-specific name
	for root testing.

diff -r c9d38610941f -r 6a0eecc6df0e lisp/ChangeLog
--- a/lisp/ChangeLog	Wed Dec 05 12:29:17 2001 +0000
+++ b/lisp/ChangeLog	Thu Dec 06 09:35:50 2001 +0000
@@ -1,3 +1,12 @@
+2001-12-05  Michael Sperber [Mr. Preprocessor]  <sperber@informatik.uni-tuebingen.de>
+
+	* packages.el (packages-compute-package-locations): Add
+	user-specific site-packages and infodock-packages hierarchies for
+	symmetry.
+
+	* find-paths.el (paths-emacs-root-p): Use version-specific name
+	for root testing.
+
 2001-07-26  Mike Sperber <mike@xemacs.org>
 
 	* files.el (auto-mode-alist): .9 files are man pages, too.
diff -r c9d38610941f -r 6a0eecc6df0e lisp/find-paths.el
--- a/lisp/find-paths.el	Wed Dec 05 12:29:17 2001 +0000
+++ b/lisp/find-paths.el	Thu Dec 06 09:35:50 2001 +0000
@@ -104,7 +104,7 @@
    ;; installed
    (paths-file-readable-directory-p (paths-construct-path (list directory
 								"lib"
-								emacs-program-name)))
+								(construct-emacs-version-name))))
    ;; in-place or windows-nt
    (and
     (paths-file-readable-directory-p (paths-construct-path (list directory "lisp")))
diff -r c9d38610941f -r 6a0eecc6df0e lisp/packages.el
--- a/lisp/packages.el	Wed Dec 05 12:29:17 2001 +0000
+++ b/lisp/packages.el	Thu Dec 06 09:35:50 2001 +0000
@@ -96,6 +96,10 @@
 The third component is a thunk which, if it returns NIL, causes
 the directory to be ignored."
   (list
+   (list (paths-construct-path (list user-init-directory "site-packages"))
+	 'early #'(lambda () t))
+   (list (paths-construct-path (list user-init-directory "infodock-packages"))
+	 'early #'(lambda () (featurep 'infodock)))
    (list (paths-construct-path (list user-init-directory "mule-packages"))
 	 'early #'(lambda () (featurep 'mule)))
    (list (paths-construct-path (list user-init-directory "xemacs-packages"))