diff options
| author | Dave Love | 2000-09-25 18:31:51 +0000 |
|---|---|---|
| committer | Dave Love | 2000-09-25 18:31:51 +0000 |
| commit | d7a7f13120c86296760d0574749283f33ee4c8b6 (patch) | |
| tree | 319f678fe841ec870ced94f84fb80bcd7007dfd3 | |
| parent | 15e7873af5ba1ad0c341c41eae8f4a74d2dbc769 (diff) | |
| download | emacs-d7a7f13120c86296760d0574749283f33ee4c8b6.tar.gz emacs-d7a7f13120c86296760d0574749283f33ee4c8b6.zip | |
(fancy-splash-head): Check XPM is available.
| -rw-r--r-- | lisp/startup.el | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lisp/startup.el b/lisp/startup.el index e8ebf6696ca..062a2851e70 100644 --- a/lisp/startup.el +++ b/lisp/startup.el | |||
| @@ -914,7 +914,8 @@ where FACE is a valid face specification, as it can be used with | |||
| 914 | (defun fancy-splash-head () | 914 | (defun fancy-splash-head () |
| 915 | "Insert the head part of the splash screen into the current buffer." | 915 | "Insert the head part of the splash screen into the current buffer." |
| 916 | (let* ((img (create-image (or fancy-splash-image | 916 | (let* ((img (create-image (or fancy-splash-image |
| 917 | (if (display-color-p) | 917 | (if (and (display-color-p) |
| 918 | (image-type-available-p 'xpm)) | ||
| 918 | "splash.xpm" "splash.pbm")))) | 919 | "splash.xpm" "splash.pbm")))) |
| 919 | (image-width (and img (car (image-size img)))) | 920 | (image-width (and img (car (image-size img)))) |
| 920 | (window-width (window-width (selected-window)))) | 921 | (window-width (window-width (selected-window)))) |