Contents in 1999-06-04-13 of release-21-2.

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

diff --git a/lisp/setup-paths.el b/lisp/setup-paths.el
index b64dc0b..b275db2 100644 (file)
--- a/lisp/setup-paths.el
+++ b/lisp/setup-paths.el
@@ -54,12 +54,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"
+                               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 +95,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")))
@@ -111,10 +141,12 @@
 
 (defun paths-find-lock-directory (roots)
   "Find the lock directory."
+  (defvar configure-lock-directory)
   (paths-find-site-directory roots "lock" "EMACSLOCKDIR" configure-lock-directory))
 
 (defun paths-find-superlock-file (lock-directory)
   "Find the superlock file."
+  ;; #### There is no such variable configure-superlock-file!
   (cond
    ((null lock-directory)
     nil)