This commit was manufactured by cvs2svn to create branch 'XEmacs-21_4'.

[chise/xemacs-chise.git.1] / lisp / setup-paths.el

diff --git a/lisp/setup-paths.el b/lisp/setup-paths.el
index 4b365ef..a01dff3 100644 (file)
--- a/lisp/setup-paths.el
+++ b/lisp/setup-paths.el
@@ -42,10 +42,14 @@
   "Depth of load-path searches in core Lisp paths.")
 
 (defvar paths-default-info-directories
-  (list (paths-construct-path '("usr" "local" "info")
-                             (char-to-string directory-sep-char))
-       (paths-construct-path '("usr" "info")
-                             (char-to-string directory-sep-char)))
+  (mapcar (function
+          (lambda (dirlist)
+            (paths-construct-path
+             dirlist (char-to-string directory-sep-char))))
+         '(("usr" "local" "info")
+           ("usr" "info")
+           ("usr" "local" "share" "info")
+           ("usr" "share" "info")))
   "Directories appended to the end of the info path by default.")
 
 (defun paths-find-site-lisp-directory (roots)
@@ -54,12 +58,23 @@
                             nil
                             configure-site-directory))
 
+(defun paths-find-site-module-directory (roots)
+  "Find the site modules directory of the XEmacs hierarchy."
+  (paths-find-site-directory roots "site-modules"
+                            nil
+                            configure-site-module-directory))
+
 (defun paths-find-lisp-directory (roots)
   "Find the main Lisp directory of the XEmacs hierarchy."
   (paths-find-version-directory roots "lisp"
                                nil
                                configure-lisp-directory))
 
+(defun paths-find-module-directory (roots)
+  "Find the main modules directory of the XEmacs hierarchy."
+  (paths-find-architecture-directory roots "modules"
+                                    nil configure-module-directory))
+
 (defun paths-construct-load-path
   (roots early-package-load-path late-package-load-path last-package-load-path
         lisp-directory
@@ -84,6 +99,25 @@
            lisp-load-path
            last-package-load-path)))
 
+(defun paths-construct-module-load-path
+  (root module-directory &optional site-module-directory)
+  "Construct the modules load path."
+  (let* ((envvar-value (getenv "EMACSMODULEPATH"))
+        (env-module-path
+         (and envvar-value
+              (paths-decode-directory-path envvar-value 'drop-empties)))
+        (site-module-load-path
+         (and site-module-directory
+              (paths-find-recursive-load-path (list site-module-directory)
+                                              paths-load-path-depth)))
+        (module-load-path
+         (and module-directory
+              (paths-find-recursive-load-path (list module-directory)
+                                              paths-load-path-depth))))
+     (append env-module-path
+           site-module-load-path
+           module-load-path)))
+
 (defun paths-construct-info-path (roots early-packages late-packages last-packages)
   "Construct the info path."
   (let ((info-path-envval (getenv "INFOPATH")))
@@ -107,7 +141,7 @@
 
 (defun paths-find-doc-directory (roots)
   "Find the documentation directory."
-  (paths-find-architecture-directory roots "lib-src"))
+  (paths-find-architecture-directory roots "lib-src" nil configure-doc-directory))
 
 (defun paths-find-lock-directory (roots)
   "Find the lock directory."
@@ -128,7 +162,8 @@
 
 (defun paths-find-exec-directory (roots)
   "Find the binary directory."
-  (paths-find-architecture-directory roots "lib-src" configure-exec-directory))
+  (paths-find-architecture-directory roots "lib-src"
+                                    nil configure-exec-directory))
 
 (defun paths-construct-exec-path (roots exec-directory
                                  early-packages late-packages last-packages)