(normal-splash-screen): Don't display the buffer if we'll

kill it right away anyway.

2 files changed, 23 insertions, 18 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 2f4b85e60a..42038d454a 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2006-09-09  Stefan Monnier  <[email protected]>
+
+	* startup.el (normal-splash-screen): Don't display the buffer if we'll
+	kill it right away anyway.
+
 2006-09-09  Eli Zaretskii  <[email protected]>
 
 	* international/codepage.el (cp850-decode-table): Fix a few codes.
@@ -21,14 +26,12 @@
 	(locate): Set buffer local value.  Use current buffer if it is
 	in Locate mode.
 	(locate-mode): Disable undo here.
-	(locate-do-setup): Use locate-current-filter from buffer to be
-	killed. 
-	(locate-update): Use locate-current-search and
-	locate-current-filter.
+	(locate-do-setup): Use locate-current-filter from buffer to be killed.
+	(locate-update): Use locate-current-search and locate-current-filter.
 
 2006-09-08  David Kastrup  <[email protected]>
 
-	* desktop.el (desktop-read): when loading a desktop, disable
+	* desktop.el (desktop-read): When loading a desktop, disable
 	saving it while the load progresses, and switch off a pending lazy
 	load by calling `desktop-lazy-abort'.
 
@@ -73,8 +76,7 @@
 
 2006-09-08  Carsten Dominik  <[email protected]>
 
-	* textmodes/org.el (org-dblock-write:clocktable): Avoid infinite
-	loop.
+	* textmodes/org.el (org-dblock-write:clocktable): Avoid infinite loop.
 
 2006-09-08  YAMAMOTO Mitsuharu  <[email protected]>
 
diff --git a/lisp/startup.el b/lisp/startup.el
index 2ef216892b..bc51b4ee03 100644
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -1386,7 +1386,7 @@ mouse."
 		    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 @@ Type \\[describe-distribution] for information on getting the latest version."))
 	  (if (and view-read-only (not view-mode))
 	      (view-mode-enter nil 'kill-buffer))
           (goto-char (point-min))
-	  (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
+          (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.
+                  nil ;; (pop-to-buffer (current-buffer))
 		(save-window-excursion
-		  (switch-to-buffer (current-buffer))
-		  (sit-for 120))
-	      (switch-to-buffer (current-buffer)))))
+                  (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")))))