From: Juri Linkov <juri@jurta.org>
Date: Fri, 24 Aug 2007 22:18:04 +0000 (+0000)
Subject: More fixes for 2007-08-21 merge conflict.
X-Git-Tag: emacs-pretest-23.0.90~11236^2~51
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=fa7e0e98d9034ff8ba48bc3f293b6517f1fa374e;p=emacs.git

More fixes for 2007-08-21 merge conflict.
---

diff --git a/lisp/startup.el b/lisp/startup.el
index 85c6af601dc..d351e84c87c 100644
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -1372,7 +1372,8 @@ Warning Warning!!!  Pure space overflow    !!!Warning Warning
 
 (defun exit-splash-screen ()
   "Stop displaying the splash screen buffer."
-  (if (get-buffer "*About GNU Emacs*")
+  (interactive)
+  (if fancy-splash-outer-buffer
       (throw 'stop-splashing nil)
     (quit-window t)))