(command-line-1): Comment out unused code for coping with the old

sit-for behavior.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f74939c4e587e3c2a9e35458bf25a5dfed961979..fb4d73ecf612f15211ea55b6f4a4360b0ec36e68 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -5,7 +5,8 @@
        concise startup screen, fit window to buffer.
        (command-line-1): If we will be using the splash screen, use
        find-file instead of find-file-other-window to find additional
-       files.
+       files.  Comment out unused code for coping with the old sit-for
+       behavior.
 
 2007-10-12  Stefan Monnier  <monnier@iro.umontreal.ca>
 

diff --git a/lisp/startup.el b/lisp/startup.el
index 35f2b7243da131c0b9c8e24e37b5d2443a3a5732..1db6dc6ebd26a91f23385cf7ac62d2c8ef165703 100644 (file)
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -2216,12 +2216,12 @@ A fancy display is used on graphic displays, normal otherwise."
        ;; Don't let the hook be run twice.
        (setq window-setup-hook nil))
 
-      ;; Do this now to avoid an annoying delay if the user
-      ;; clicks the menu bar during the sit-for.
-      (when (display-popup-menus-p)
-       (precompute-menubar-bindings))
-      (with-no-warnings
-       (setq menubar-bindings-done t))
+      ;; ;; Do this now to avoid an annoying delay if the user
+      ;; ;; clicks the menu bar during the sit-for.
+      ;; (when (display-popup-menus-p)
+      ;;       (precompute-menubar-bindings))
+      ;; (with-no-warnings
+      ;;       (setq menubar-bindings-done t))
 
       ;; If *scratch* exists and is empty, insert initial-scratch-message.
       (and initial-scratch-message