(JC3-81C0): New character.

[chise/xemacs-chise.git-] / lisp / startup.el

diff --git a/lisp/startup.el b/lisp/startup.el
index 27298b9..b519a9a 100644 (file)
--- 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-2000 MORIOKA Tomohiko
+"))
 
     ((face (blue bold underline) "\nInformation, on-line help:\n\n")
      "XEmacs comes with plenty of documentation...\n\n"