X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/51668a535e318edb64b52c69126f2e70c3ebcdec..44caa96dc5c16cbc4ee1bb26ec880af2e2ecf9f8:/lisp/startup.el

diff --git a/lisp/startup.el b/lisp/startup.el
index 97a6a0bfbc..761e69e03b 100644
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -77,7 +77,7 @@ once you are familiar with the contents of the startup screen."
 (defvar startup-screen-inhibit-startup-screen nil)
 
 ;; The mechanism used to ensure that only end users can disable this
-;; message is not complex. Clearly, it is possible for a determined
+;; message is not complex.  Clearly, it is possible for a determined
 ;; system administrator to inhibit this message anyway, but at least
 ;; they will do so with knowledge of why the Emacs developers think
 ;; this is a bad idea.
@@ -86,7 +86,7 @@ once you are familiar with the contents of the startup screen."
 
 The startup message is in the echo area as it provides information
 about GNU Emacs and the GNU system in general, which we want all
-users to see. As this is the least intrusive startup message,
+users to see.  As this is the least intrusive startup message,
 this variable gets specialized treatment to prevent the message
 from being disabled site-wide by systems administrators, while
 still allowing individual users to do so.
@@ -439,7 +439,7 @@ Warning Warning!!!  Pure space overflow    !!!Warning Warning
   :initialize #'custom-initialize-delay)
 
 (defun normal-top-level-add-subdirs-to-load-path ()
-  "Add all subdirectories of `default-directory' to `load-path'.
+  "Recursively add all subdirectories of `default-directory' to `load-path'.
 More precisely, this uses only the subdirectories whose names
 start with letters or digits; it excludes any subdirectory named `RCS'
 or `CVS', and any subdirectory that contains a file named `.nosearch'."
@@ -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)))))))