[Emacs-diffs] Changes to emacs/lisp/startup.el

[John Paul Wallington]

Index: emacs/lisp/startup.el
diff -c emacs/lisp/startup.el:1.305 emacs/lisp/startup.el:1.306
*** emacs/lisp/startup.el:1.305 Sat Aug 24 10:26:06 2002
--- emacs/lisp/startup.el       Wed Sep  4 20:19:49 2002
***************
*** 1322,1335 ****
    (when (or (and (display-color-p)
                 (image-type-available-p 'xpm))
            (image-type-available-p 'pbm))
!     (let* ((frame (fancy-splash-frame))
!          (img (create-image (or fancy-splash-image
!                                 (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)))))
  
  
  (defun normal-splash-screen ()
--- 1322,1336 ----
    (when (or (and (display-color-p)
                 (image-type-available-p 'xpm))
            (image-type-available-p 'pbm))
!     (let ((frame (fancy-splash-frame)))
!       (when frame
!       (let* ((img (create-image (or fancy-splash-image
!                                     (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)))))))
  
  
  (defun normal-splash-screen ()