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

sit-for behavior.

2 files changed, 8 insertions, 7 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f74939c4e58..fb4d73ecf61 100644
--- 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 35f2b7243da..1db6dc6ebd2 100644
--- 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