mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-11-24 07:20:37 +00:00
Code Issues Releases Activity

(use-fancy-splash-screens-p): Use frame-height

Browse Source 
instead of window-height.  Pass frame to image-size.
This commit is contained in:
Richard M. Stallman 2006-12-14 15:16:52 +00:00
parent b1c6aa6ebe
commit a68ccb40d6
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lisp/startup.el
View File

@ -1451,9 +1451,12 @@ we put it on this frame."
(if (and (display-color-p)
(image-type-available-p 'xpm))
"splash.xpm" "splash.pbm"))))
(image-height (and img (cdr (image-size img))))
(window-height (1- (window-height (frame-selected-window frame)))))
(> window-height (+ image-height 19)))))))
(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))))
(> frame-height (+ image-height 19)))))))
(defun normal-splash-screen (&optional hide-on-input)