(A-GT-K02849): New abstract node; unify A-U+8FB0-itaiji-001.

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

diff --git a/lisp/setup-paths.el b/lisp/setup-paths.el
index b275db2..7ad409b 100644 (file)
--- a/lisp/setup-paths.el
+++ b/lisp/setup-paths.el
@@ -38,14 +38,27 @@
 \f
 ;;; Code:
 
-(defvar paths-load-path-depth 1
+(defvar paths-core-load-path-depth 0
   "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-mule-load-path-depth 0
+  "Depth of load-path searches in Mule Lisp paths.")
+
+(defvar paths-utf-2000-load-path-depth 0
+  "Depth of load-path searches in UTF-2000 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)
@@ -66,15 +79,42 @@
                                nil
                                configure-lisp-directory))
 
+(defun paths-find-mule-lisp-directory (roots &optional lisp-directory)
+  "Find the Mule Lisp directory of the XEmacs hierarchy."
+  ;; #### kludge
+  (if lisp-directory
+      (let ((guess
+            (file-name-as-directory
+             (paths-construct-path (list lisp-directory "mule")))))
+       (if (paths-file-readable-directory-p guess)
+           guess
+         (paths-find-version-directory roots "mule-lisp"
+                                       nil
+                                       configure-mule-lisp-directory)))))
+
+(defun paths-find-utf-2000-lisp-directory (roots &optional lisp-directory)
+  "Find the UTF-2000 Lisp directory of the XEmacs hierarchy."
+  ;; #### kludge
+  (if lisp-directory
+      (let ((guess
+            (file-name-as-directory
+             (paths-construct-path (list lisp-directory "utf-2000")))))
+       (if (paths-file-readable-directory-p guess)
+           guess
+         (paths-find-version-directory roots "utf-2000-lisp"
+                                       nil
+                                       configure-utf-2000-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))
+                                    nil configure-module-directory))
 
 (defun paths-construct-load-path
   (roots early-package-load-path late-package-load-path last-package-load-path
         lisp-directory
-        &optional site-lisp-directory)
+        &optional site-lisp-directory mule-lisp-directory
+        utf-2000-lisp-directory)
   "Construct the load path."
   (let* ((envvar-value (getenv "EMACSLOADPATH"))
         (env-load-path
@@ -83,15 +123,25 @@
         (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)))
+        (mule-lisp-load-path
+         (and mule-lisp-directory
+              (paths-find-recursive-load-path (list mule-lisp-directory)
+                                              paths-mule-load-path-depth)))
+        (utf-2000-lisp-load-path
+         (and utf-2000-lisp-directory
+              (paths-find-recursive-load-path (list utf-2000-lisp-directory)
+                                              paths-utf-2000-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
            late-package-load-path
+           utf-2000-lisp-load-path
+           mule-lisp-load-path
            lisp-load-path
            last-package-load-path)))
 
@@ -105,11 +155,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)))
@@ -137,28 +187,12 @@
 
 (defun paths-find-doc-directory (roots)
   "Find the documentation directory."
-  (paths-find-architecture-directory roots "lib-src"))
-
-(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))))
+  (paths-find-architecture-directory roots "lib-src" nil configure-doc-directory))
 
 (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)