fancy splash screen not shown most of the time

[Claudio Bley]

Hi.

Since a few months (I can't tell exactly when this started happening)
I noticed that sometimes the splash image would not be displayed when
starting Emacs; sometimes it worked.

I simply augmented the startup.el file as follows:

,----
| diff --git a/lisp/startup.el b/lisp/startup.el
| index 059d771..1e15b29 100644
| --- a/lisp/startup.el
| +++ b/lisp/startup.el
| @@ -1736,6 +1737,7 @@ we put it on this frame."
|                   (image-type-available-p 'pbm)))
|      (let ((frame (fancy-splash-frame)))
|        (when frame
| +       (message "graphics OK")
|         (let* ((img (create-image (or fancy-splash-image
|                                       (if (and (display-color-p)
|                                                (image-type-available-p 'xpm))
| @@ -2055,7 +2057,7 @@ screen."
|    (if (not (get-buffer "*GNU Emacs*"))
|        (if (use-fancy-splash-screens-p)
|           (fancy-startup-screen concise)
| -       (normal-splash-screen t concise))))
| +       (message "normal") (normal-splash-screen t concise))))
| 
|  (defun display-about-screen ()
|    "Display the *About GNU Emacs* buffer.
`----

and started Emacs with "emacs -q --no-site-file --no-site-lisp".

90% of my testing it would not display the fancy message, but just the
normal one (also seeing "normal" in the *Messages* buffer), because
the `fancy-splash-frame' function obviously returned `nil'.

As it seems, the problem exists on w32 as well as on linux.

How about this patch?

------ 8< ------ >8 -------------- 8< --------- >8 ------------------------
From 9b490d15f3e8f41293f58373004fd251c467b5a2 Mon Sep 17 00:00:00 2001
From: Claudio Bley <address@hidden>
Date: Tue, 22 Oct 2013 08:57:26 +0200
Subject: [PATCH] Ensure to choose a reasonable fancy splash frame on startup

* startup.el (fancy-splash-frame): Return the currently selected frame
when no visible frame without active minibuffer was found.
---
 lisp/ChangeLog  | 5 +++++
 lisp/startup.el | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index fcefcf8..648f23b 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2013-10-22  Claudio Bley  <address@hidden>
+
+       * startup.el (fancy-splash-frame): Return the currently selected frame
+       when no visible frame without active minibuffer was found.
+
 2013-10-16  Michael Albinus  <address@hidden>
 
        * net/tramp-smb.el (tramp-smb-acl-program): New customer option.
diff --git a/lisp/startup.el b/lisp/startup.el
index 059d771..7cc5d82 100644
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -1726,7 +1726,7 @@ we put it on this frame."
       (if (and (frame-visible-p frame)
               (not (window-minibuffer-p (frame-selected-window frame))))
          (setq chosen-frame frame)))
-    chosen-frame))
+    (or chosen-frame (selected-frame))))
 
 (defun use-fancy-splash-screens-p ()
   "Return t if fancy splash screens should be used."
-- 
1.8.4.msysgit.0