XEmacs 21.4.5 "Civil Service".

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

diff --git a/lisp/startup.el b/lisp/startup.el
index 66524d2..6085ac1 100644 (file)
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -463,24 +463,10 @@ 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))
-    ;;####FSFmacs junk
-    ;;      (or menubar-bindings-done
-    ;;   (precompute-menubar-bindings))
+    ;; FSF calls precompute-menubar-bindings.  We don't mix menubars
+    ;; and keymaps.
     ))
 
-;;####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.
@@ -591,6 +577,9 @@ 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))