X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Fstartup.el;h=32deb9279811ed6c990dbe616cb1d875db1e0c07;hb=d4b236b78c9e33a6b6a26ac428c36191013d97c6;hp=8a73014cdbdd8385ab05378a424a2ed8a81c0e91;hpb=113b194be934327de99a168d809271db252c07c4;p=chise%2Fxemacs-chise.git

diff --git a/lisp/startup.el b/lisp/startup.el
index 8a73014..32deb92 100644
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -401,10 +401,15 @@ Type ^H^H^H (Control-h Control-h Control-h) to get more help options.\n")
 			     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
@@ -968,11 +973,12 @@ XEmacs, by either running the command `xemacs-mule', or by using the X resource
      "\n--\n"
      (face italic "\
 Copyright (C) 1985-1999 Free Software Foundation, Inc.
+Copyright (C) 1995-1999 Electrotechnical Laboratory, JAPAN.
 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"))
-    
+
     ((face (blue bold underline) "\nInformation, on-line help:\n\n")
      "XEmacs comes with plenty of documentation...\n\n"
      ,@(if (string-match "beta" emacs-version)