From: Noam Postavsky <npostavs@gmail.com>
Date: Wed, 23 May 2018 23:26:49 +0000 (-0400)
Subject: Default to splash on current frame, if none visible (Bug#31169)
X-Git-Tag: emacs-27.0.90~4797
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=91ebbbfa107c60db84e09d54d952ffd969821ccb;p=emacs.git

Default to splash on current frame, if none visible (Bug#31169)

* lisp/startup.el (fancy-splash-frame): Default to current frame.
---

diff --git a/lisp/startup.el b/lisp/startup.el
index fdf6cc1dbaa..c1e56fcdff3 100644
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -1903,7 +1903,8 @@ 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))
+    ;; If there are no visible frames yet, try the selected one.
+    (or chosen-frame (selected-frame))))
 
 (defun use-fancy-splash-screens-p ()
   "Return t if fancy splash screens should be used."