update.

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

diff --git a/lisp/startup.el b/lisp/startup.el
index 6085ac1..b519a9a 100644 (file)
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -421,10 +421,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
@@ -463,10 +468,24 @@ Type ^H^H^H (Control-h Control-h Control-h) to get more help options.\n")
 
     (if load-user-init-file-p
        (maybe-migrate-user-init-file))
-    ;; FSF calls precompute-menubar-bindings.  We don't mix menubars
-    ;; and keymaps.
+    ;;####FSFmacs junk
+    ;;      (or menubar-bindings-done
+    ;;   (precompute-menubar-bindings))
     ))
 
+;;####FSFmacs junk
+;;; Precompute the keyboard equivalents in the menu bar items.
+;;(defun precompute-menubar-bindings ()
+;;  (if (eq window-system 'x)
+;;      (let ((submap (lookup-key global-map [menu-bar])))
+;;     (while submap
+;;       (and (consp (car submap))
+;;            (symbolp (car (car submap)))
+;;            (stringp (car-safe (cdr (car submap))))
+;;            (keymapp (cdr (cdr (car submap))))
+;;            (x-popup-menu nil (cdr (cdr (car submap)))))
+;;       (setq submap (cdr submap))))))
+
 (defun command-line-early (args)
   ;; This processes those switches which need to be processed before
   ;; starting up the window system.
@@ -577,9 +596,6 @@ If this is nil, no message will be displayed.")
       ;; handled here instead of down in C.
       (setq command-line-args-left (command-line-early command-line-args-left))
 
-      (when (eq system-type 'windows-nt)
-       (init-mswindows-at-startup))
-
       ;; Setup the toolbar icon directory
       (when (featurep 'toolbar)
        (init-toolbar-location))
@@ -783,11 +799,11 @@ directory which will load the relocated initialization code.")
   (if (not user-init-file)
       (setq user-init-file
            (find-user-init-file user-init-directory)))
-  (if (not custom-file)
-      (setq custom-file (make-custom-file-name user-init-file)))
   (if (and user-init-file
           (file-readable-p user-init-file))
       (load user-init-file t t t))
+  (if (not custom-file)
+      (setq custom-file (make-custom-file-name user-init-file)))
   (if (and custom-file
           (or (not user-init-file)
               (not (string= custom-file user-init-file)))
@@ -1113,11 +1129,13 @@ XEmacs, by either running the command `xemacs-mule', or by using the X resource
       ": how to get the latest version\n")
      "\n--\n"
      (face italic "\
-Copyright (C) 1985-2001 Free Software Foundation, Inc.
+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-2001 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"
@@ -1265,17 +1283,6 @@ 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 '()))
-
   (setq site-directory (and (null inhibit-site-lisp)
                            (paths-find-site-lisp-directory roots)))
 
@@ -1288,8 +1295,7 @@ It's idempotent, so call this as often as you like!"
                                             late-package-load-path
                                             last-package-load-path
                                             lisp-directory
-                                            site-directory
-                                            mule-lisp-directory))
+                                            site-directory))
 
   (setq Info-directory-list
        (paths-construct-info-path roots
@@ -1356,9 +1362,6 @@ 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 (null exec-directory) (push "exec-directory" warnings))
        (if (null data-directory) (push "data-directory" warnings))
        (if (null doc-directory)  (push "doc-directory"  warnings))