[Emacs-diffs] Changes to emacs/lisp/startup.el,v

[Stefan Monnier]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Stefan Monnier <monnier>        06/09/09 19:21:32

Index: startup.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/startup.el,v
retrieving revision 1.412
retrieving revision 1.413
diff -u -b -r1.412 -r1.413
--- startup.el  29 Aug 2006 16:11:25 -0000      1.412
+++ startup.el  9 Sep 2006 19:21:31 -0000       1.413
@@ -1386,7 +1386,7 @@
                    minor-mode-map-alist old-minor-mode-map-alist
                    emulation-mode-map-alists old-emulation-mode-map-alists)
              (kill-buffer splash-buffer)))))
-    ;; If hide-on-input is non-nil, don't hide the buffer on input.
+    ;; If hide-on-input is nil, don't hide the buffer on input.
     (if (or (window-minibuffer-p)
            (window-dedicated-p (selected-window)))
        (pop-to-buffer (current-buffer))
@@ -1586,17 +1586,20 @@
          (if (and view-read-only (not view-mode))
              (view-mode-enter nil 'kill-buffer))
           (goto-char (point-min))
+          (if hide-on-input
          (if (or (window-minibuffer-p)
                  (window-dedicated-p (selected-window)))
              ;; If hide-on-input is nil, creating a new frame will
              ;; generate enough events that the subsequent `sit-for'
              ;; will immediately return anyway.
-             (pop-to-buffer (current-buffer))
-           (if hide-on-input
+                  nil ;; (pop-to-buffer (current-buffer))
                (save-window-excursion
                  (switch-to-buffer (current-buffer))
-                 (sit-for 120))
-             (switch-to-buffer (current-buffer)))))
+                 (sit-for 120)))
+          (condition-case nil
+              (switch-to-buffer (current-buffer))
+            ;; In case the window is dedicated or something.
+            (error (pop-to-buffer (current-buffer))))))
       ;; Unwind ... ensure splash buffer is killed
       (if hide-on-input
          (kill-buffer "GNU Emacs")))))