Index: lisp/ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/ChangeLog,v
retrieving revision 1.266.2.88
diff -a -u -u -0 -r1.266.2.88 ChangeLog
--- lisp/ChangeLog	2005/12/07 01:16:46	1.266.2.88
+++ lisp/ChangeLog	2005/12/26 22:26:30
@@ -0,0 +1,9 @@
+2005-12-26  Vin Shelton  <acs@xemacs.org>
+
+	* find-paths.el:
+	* find-paths.el (paths-emacs-root-p): Add search for package root.
+	* find-paths.el (paths-find-emacs-root): Replaced with
+	paths-find-invocation-roots, which returns a list of roots.
+	* find-paths.el (paths-find-invocation-roots): New.
+	* find-paths.el (paths-find-emacs-roots): Call paths-find-invocation-roots.
+
Index: lisp/find-paths.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/find-paths.el,v
retrieving revision 1.19.2.2
diff -a -u -u -0 -r1.19.2.2 find-paths.el
--- lisp/find-paths.el	2002/08/20 11:34:41	1.19.2.2
+++ lisp/find-paths.el	2005/12/26 22:26:30
@@ -111 +111,6 @@
-    (paths-file-readable-directory-p (paths-construct-path (list directory "etc"))))))
+    (paths-file-readable-directory-p (paths-construct-path (list directory "etc"))))
+
+   ;; searching for a package directory on Windows
+   (and
+    (string-match "win32\\|cygwin" system-configuration)
+    (paths-file-readable-directory-p (paths-construct-path (list directory "xemacs-packages"))))))
@@ -126,3 +131,4 @@
-(defun paths-find-emacs-root
-  (invocation-directory invocation-name)
-  "Find the run-time root of XEmacs."
+(defun paths-find-invocation-roots (invocation-directory invocation-name)
+  "Find the list of run-time roots of XEmacs.
+INVOCATION-DIRECTORY is a directory containing the XEmacs executable.
+INVOCATION-NAME is the name of the executable itself."
@@ -137,4 +143,3 @@
-    (or (and (paths-emacs-root-p maybe-root-1)
-	     maybe-root-1)
-	(and (paths-emacs-root-p maybe-root-2)
-	     maybe-root-2))))
+
+    (paths-filter #'paths-emacs-root-p
+		  (list maybe-root-1 maybe-root-2))))
@@ -304,5 +309,2 @@
-  (let* ((potential-invocation-root
-	  (paths-find-emacs-root invocation-directory invocation-name))
-	 (invocation-roots
-	  (and potential-invocation-root
-	       (list potential-invocation-root)))
+  (let* ((invocation-roots
+	  (paths-find-invocation-roots invocation-directory invocation-name))