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

[Glenn Morris]

Index: emacs/lisp/startup.el
diff -c emacs/lisp/startup.el:1.323 emacs/lisp/startup.el:1.324
*** emacs/lisp/startup.el:1.323 Fri Sep 19 13:12:53 2003
--- emacs/lisp/startup.el       Fri Sep 19 18:42:24 2003
***************
*** 1341,1349 ****
  
  (defun use-fancy-splash-screens-p ()
    "Return t if fancy splash screens should be used."
!   (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
--- 1341,1350 ----
  
  (defun use-fancy-splash-screens-p ()
    "Return t if fancy splash screens should be used."
!   (when (and (display-graphic-p)
!              (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
***************
*** 1517,1524 ****
  Fancy splash screens are used on graphic displays,
  normal otherwise."
    (interactive)
!   (if (and (display-graphic-p)
!          (use-fancy-splash-screens-p))
        (fancy-splash-screens)
      (normal-splash-screen)))
  
--- 1518,1524 ----
  Fancy splash screens are used on graphic displays,
  normal otherwise."
    (interactive)
!   (if (use-fancy-splash-screens-p)
        (fancy-splash-screens)
      (normal-splash-screen)))