diff options
Diffstat (limited to 'lisp/startup.el')
| -rw-r--r-- | lisp/startup.el | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/lisp/startup.el b/lisp/startup.el index 5641686e30e..c28fc728145 100644 --- a/lisp/startup.el +++ b/lisp/startup.el @@ -1538,17 +1538,15 @@ Type \\[describe-distribution] for information on getting the latest version.")) ;; Display the input that we set up in the buffer. (set-buffer-modified-p nil) (goto-char (point-min)) - (save-window-excursion - (condition-case nil - (switch-to-buffer (current-buffer)) - ;; In case we're in a dedicated or minibuffer-only window. - (error - ;; There's no point is using pop-to-buffer since creating - ;; a new frame will generate enough events that the - ;; subsequent `sit-for' will immediately return anyway. - ;; (pop-to-buffer (current-buffer)) - )) - (sit-for 120))) + (if (or (window-minibuffer-p) + (window-dedicated-p (selected-window))) + ;; There's no point is using pop-to-buffer since 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)))) ;; Unwind ... ensure splash buffer is killed (kill-buffer "GNU Emacs")))) |