X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Fstartup.el;h=e7413ab1ac433658080d4ae408caf3cf03d455db;hb=e714bc316e9cb4e651289624616cf86a10af4767;hp=27298b95d34b0e2d1e4344ef7a1e4eb124c7ecff;hpb=0c693dc08f0794304711787b2eb47c144ea4bef1;p=chise%2Fxemacs-chise.git-

diff --git a/lisp/startup.el b/lisp/startup.el
index 27298b9..e7413ab 100644
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -413,18 +413,23 @@ Type ^H^H^H (Control-h Control-h Control-h) to get more help options.\n")
 		 'external-debugging-output))
 
       (if (null emacs-roots)
-	  (startup-find-roots-warning)
-	(startup-setup-paths emacs-roots
-			     user-init-directory
-			     inhibit-early-packages
-			     inhibit-site-lisp
-			     debug-paths))
+	  (startup-find-roots-warning))
+      (startup-setup-paths emacs-roots
+			   user-init-directory
+			   inhibit-early-packages
+			   inhibit-site-lisp
+			   debug-paths)
       (startup-setup-paths-warning))
 
-    (if (and (not inhibit-autoloads)
-	     lisp-directory)
-	(load (expand-file-name (file-name-sans-extension autoload-file-name)
-				lisp-directory) nil t))
+    (when (and (not inhibit-autoloads)
+	       lisp-directory)
+      (load (expand-file-name (file-name-sans-extension autoload-file-name)
+			      lisp-directory) nil t)
+      (if (featurep 'utf-2000)
+	  (load (expand-file-name
+		 (file-name-sans-extension autoload-file-name)
+		 (expand-file-name "utf-2000" lisp-directory))
+		nil t)))
 
     (if (not inhibit-autoloads)
 	(progn
@@ -1128,7 +1133,9 @@ Copyright (C) 1985-1999 Free Software Foundation, Inc.
 Copyright (C) 1990-1994 Lucid, Inc.
 Copyright (C) 1993-1997 Sun Microsystems, Inc. All Rights Reserved.
 Copyright (C) 1994-1996 Board of Trustees, University of Illinois
-Copyright (C) 1995-1996 Ben Wing\n"))
+Copyright (C) 1995-1996 Ben Wing
+Copyright (C) 1996-2002 MORIOKA Tomohiko
+"))
 
     ((face (blue bold underline) "\nInformation, on-line help:\n\n")
      "XEmacs comes with plenty of documentation...\n\n"
@@ -1276,6 +1283,28 @@ It's idempotent, so call this as often as you like!"
       (princ (format "lisp-directory:\n%S\n" lisp-directory)
 	     'external-debugging-output))
 
+  (if (featurep 'mule)
+      (progn
+	(setq mule-lisp-directory
+	      (paths-find-mule-lisp-directory roots
+					      lisp-directory))
+	(if debug-paths
+	    (princ (format "mule-lisp-directory:\n%S\n"
+			   mule-lisp-directory)
+		   'external-debugging-output)))
+    (setq mule-lisp-directory '()))
+
+  (if (featurep 'utf-2000)
+      (progn
+	(setq utf-2000-lisp-directory
+	      (paths-find-utf-2000-lisp-directory roots
+						  lisp-directory))
+	(if debug-paths
+	    (princ (format "utf-2000-lisp-directory:\n%S\n"
+			   utf-2000-lisp-directory)
+		   'external-debugging-output)))
+    (setq utf-2000-lisp-directory '()))
+
   (setq site-directory (and (null inhibit-site-lisp)
 			    (paths-find-site-lisp-directory roots)))
 
@@ -1288,7 +1317,9 @@ It's idempotent, so call this as often as you like!"
 					     late-package-load-path
 					     last-package-load-path
 					     lisp-directory
-					     site-directory))
+					     site-directory
+					     mule-lisp-directory
+					     utf-2000-lisp-directory))
 
   (setq Info-directory-list
 	(paths-construct-info-path roots
@@ -1355,6 +1386,12 @@ It's idempotent, so call this as often as you like!"
 	(erase-buffer)
 	(buffer-disable-undo (current-buffer))
 	(if (null lisp-directory) (push "lisp-directory" warnings))
+	(if (and (featurep 'mule)
+		 (null mule-lisp-directory))
+	    (push "mule-lisp-directory" warnings))
+	(if (and (featurep 'utf-2000)
+		 (null utf-2000-lisp-directory))
+	    (push "utf-2000-lisp-directory" warnings))
 	(if (null exec-directory) (push "exec-directory" warnings))
 	(if (null data-directory) (push "data-directory" warnings))
 	(if (null doc-directory)  (push "doc-directory"  warnings))