aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGerd Moellmann2000-09-22 11:20:05 +0000
committerGerd Moellmann2000-09-22 11:20:05 +0000
commit13f93deebaa77d555c3b8fd9a3cbc39b8574a8eb (patch)
tree85a6876e1a3d6bfb4b1bea0146b0d7d41f77adbb
parent36a03bf9d688b6c164a3136bf6d2821952b382d5 (diff)
downloademacs-13f93deebaa77d555c3b8fd9a3cbc39b8574a8eb.tar.gz
emacs-13f93deebaa77d555c3b8fd9a3cbc39b8574a8eb.zip
(fancy-splash-head): Use splash.pbm instead of
splash.xbm.
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/startup.el4
2 files changed, 7 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 70a8c1ce83e..d0565776597 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12000-09-22 Gerd Moellmann <gerd@gnu.org>
2
3 * startup.el (fancy-splash-head): Use splash.pbm instead of
4 splash.xbm.
5
12000-09-22 Andre Spiegel <spiegel@gnu.org> 62000-09-22 Andre Spiegel <spiegel@gnu.org>
2 7
3 * vc.el (vc-switch-backend): Signal an error if the file is not 8 * vc.el (vc-switch-backend): Signal an error if the file is not
diff --git a/lisp/startup.el b/lisp/startup.el
index 3353330a198..3d178d89619 100644
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -915,7 +915,7 @@ where FACE is a valid face specification, as it can be used with
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 (display-color-p)
918 "splash.xpm" "splash.xbm")))) 918 "splash.xpm" "splash.pbm"))))
919 (image-width (and img (car (image-size img)))) 919 (image-width (and img (car (image-size img))))
920 (window-width (window-width (selected-window)))) 920 (window-width (window-width (selected-window))))
921 (when img 921 (when img
@@ -1049,7 +1049,7 @@ where FACE is a valid face specification, as it can be used with
1049 (if (assq 'display (frame-parameters)) 1049 (if (assq 'display (frame-parameters))
1050 (if (or (and (display-color-p) 1050 (if (or (and (display-color-p)
1051 (image-type-available-p 'xpm)) 1051 (image-type-available-p 'xpm))
1052 (image-type-available-p 'xbm)) 1052 (image-type-available-p 'pbm))
1053 (fancy-splash-screens) 1053 (fancy-splash-screens)
1054 (progn 1054 (progn
1055 (insert "\ 1055 (insert "\