# HG changeset patch
# User Chong Yidong <cyd@stupidchicken.com>
# Date 1158430985 0
# Node ID 980586804d04062ee3d17d5d70e22eda08220a34
# Parent  4ec3fdbaa1ab533173177b3cb4f42ecf619d63c7
	* startup.el (fancy-splash-screens): Don't switch to the scratch
	buffer; it may not be the next buffer.

diff -r 4ec3fdbaa1ab -r 980586804d04 lisp/ChangeLog
--- a/lisp/ChangeLog	Sat Sep 16 18:22:01 2006 +0000
+++ b/lisp/ChangeLog	Sat Sep 16 18:23:05 2006 +0000
@@ -1,3 +1,8 @@
+2006-09-16  Chong Yidong  <cyd@stupidchicken.com>
+
+	* startup.el (fancy-splash-screens): Don't switch to the scratch
+	buffer; it may not be the next buffer.
+
 2006-09-16  Romain Francoise  <romain@orebokech.com>
 
 	* saveplace.el (load-save-place-alist-from-file): Use expanded name
diff -r 4ec3fdbaa1ab -r 980586804d04 lisp/startup.el
--- a/lisp/startup.el	Sat Sep 16 18:22:01 2006 +0000
+++ b/lisp/startup.el	Sat Sep 16 18:23:05 2006 +0000
@@ -1383,11 +1383,7 @@
 	      (setq display-hourglass old-hourglass
 		    minor-mode-map-alist old-minor-mode-map-alist
 		    emulation-mode-map-alists old-emulation-mode-map-alists)
-	      (use-local-map nil)
-	      (switch-to-buffer "*scratch*")
-;;;  Comment out the next line in order to see the splash buffer exactly as it was.
-	      (kill-buffer splash-buffer)
-	      ))))
+	      (kill-buffer splash-buffer)))))
     ;; If hide-on-input is nil, don't hide the buffer on input.
     (if (or (window-minibuffer-p)
 	    (window-dedicated-p (selected-window)))