XEmacs 21.2.41 "Polyhymnia".

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

diff --git a/lisp/setup-paths.el b/lisp/setup-paths.el
index a01dff3..d22ba46 100644 (file)
--- a/lisp/setup-paths.el
+++ b/lisp/setup-paths.el
@@ -38,9 +38,12 @@
 \f
 ;;; Code:
 
-(defvar paths-load-path-depth 1
+(defvar paths-core-load-path-depth 1
   "Depth of load-path searches in core Lisp paths.")
 
+(defvar paths-site-load-path-depth 1
+  "Depth of load-path searches in site Lisp paths.")
+
 (defvar paths-default-info-directories
   (mapcar (function
           (lambda (dirlist)
@@ -87,11 +90,11 @@
         (site-lisp-load-path
          (and site-lisp-directory
               (paths-find-recursive-load-path (list site-lisp-directory)
-                                              paths-load-path-depth)))
+                                              paths-site-load-path-depth)))
         (lisp-load-path
          (and lisp-directory
               (paths-find-recursive-load-path (list lisp-directory)
-                                              paths-load-path-depth))))
+                                              paths-core-load-path-depth))))
     (append env-load-path
            early-package-load-path
            site-lisp-load-path
@@ -109,11 +112,11 @@
         (site-module-load-path
          (and site-module-directory
               (paths-find-recursive-load-path (list site-module-directory)
-                                              paths-load-path-depth)))
+                                              paths-site-load-path-depth)))
         (module-load-path
          (and module-directory
               (paths-find-recursive-load-path (list module-directory)
-                                              paths-load-path-depth))))
+                                              paths-core-load-path-depth))))
      (append env-module-path
            site-module-load-path
            module-load-path)))
@@ -143,23 +146,6 @@
   "Find the documentation directory."
   (paths-find-architecture-directory roots "lib-src" nil configure-doc-directory))
 
-(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)
-   ((and configure-superlock-file
-        (file-directory-p (file-name-directory configure-superlock-file)))
-    configure-superlock-file)
-   (t
-    (expand-file-name "!!!SuperLock!!!" lock-directory))))
-
 (defun paths-find-exec-directory (roots)
   "Find the binary directory."
   (paths-find-architecture-directory roots "lib-src"