[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs-25 326c64f: Fix splash screen display at startup
From: |
Eli Zaretskii |
Subject: |
[Emacs-diffs] emacs-25 326c64f: Fix splash screen display at startup |
Date: |
Fri, 25 Mar 2016 07:46:44 +0000 |
branch: emacs-25
commit 326c64fcc37cdb31183ec62d5535ec0a52c4738e
Author: Eli Zaretskii <address@hidden>
Commit: Eli Zaretskii <address@hidden>
Fix splash screen display at startup
* src/frame.c (DEFAULT_ROWS): Enlarge to 36, so that the initial
window displayed by "emacs -q" has enough space to show the whole
text even if it includes 2 lines talking about recovering crashes
sessions. (Bug#23074)
* lisp/startup.el (use-fancy-splash-screens-p): Fix off-by-one
error when computing the window-height from frame-height.
* etc/NEWS: Mention the change.
---
etc/NEWS | 6 ++++++
lisp/startup.el | 10 ++++++----
src/frame.c | 2 +-
3 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/etc/NEWS b/etc/NEWS
index 3defc19..35f9341 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -123,6 +123,12 @@ command line when 'initial-buffer-choice' is non-nil.
** The value of 'initial-scratch-message' is now treated as a doc string
and can contain escape sequences for command keys, quotes, and the like.
+---
+** The default height of GUI frames was enlarged.
+This is so there's enough space in the initial window to display the
+optional text about recovering crashes sessions, without losing the
+splash image display.
+
* Changes in Emacs 25.1
diff --git a/lisp/startup.el b/lisp/startup.el
index 15a79f6..536289c 100644
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -1890,10 +1890,12 @@ we put it on this frame."
(when frame
(let* ((img (create-image (fancy-splash-image-file)))
(image-height (and img (cdr (image-size img nil frame))))
- ;; We test frame-height so that, if the frame is split
- ;; by displaying a warning, that doesn't cause the normal
- ;; splash screen to be used.
- (frame-height (1- (frame-height frame))))
+ ;; We test frame-height and not window-height so that,
+ ;; if the frame is split by displaying a warning, that
+ ;; doesn't cause the normal splash screen to be used.
+ ;; We subtract 2 from frame-height to account for the
+ ;; echo area and the mode line.
+ (frame-height (- (frame-height frame) 2)))
(> frame-height (+ image-height 19)))))))
diff --git a/src/frame.c b/src/frame.c
index 7511d53..53ff059 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -4565,7 +4565,7 @@ On Nextstep, this just calls `ns-parse-geometry'. */)
This function does not make the coordinates positive. */
-#define DEFAULT_ROWS 35
+#define DEFAULT_ROWS 36
#define DEFAULT_COLS 80
long
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] emacs-25 326c64f: Fix splash screen display at startup,
Eli Zaretskii <=