Mercurial > emacs
comparison lisp/startup.el @ 34129:9aede9b4161c
(use-fancy-splash-screens-p): New function.
(command-line-1): Use it to determine whether or not to use
a fancy splash screen.
| author | Gerd Moellmann <gerd@gnu.org> |
|---|---|
| date | Sat, 02 Dec 2000 20:17:48 +0000 |
| parents | 29bb0c0782b1 |
| children | 30ed482c0d7b |
comparison
equal
deleted
inserted
replaced
| 34128:f51ea294cc74 | 34129:9aede9b4161c |
|---|---|
| 1151 (cancel-timer timer) | 1151 (cancel-timer timer) |
| 1152 (setq display-busy-cursor old-busy-cursor) | 1152 (setq display-busy-cursor old-busy-cursor) |
| 1153 (kill-buffer splash-buffer))))) | 1153 (kill-buffer splash-buffer))))) |
| 1154 | 1154 |
| 1155 | 1155 |
| 1156 (defun use-fancy-splash-screens-p () | |
| 1157 "Return t if fancy splash screens should be used." | |
| 1158 (when (or (and (display-color-p) | |
| 1159 (image-type-available-p 'xpm)) | |
| 1160 (image-type-available-p 'pbm)) | |
| 1161 (let* ((img (create-image (or fancy-splash-image | |
| 1162 (if (and (display-color-p) | |
| 1163 (image-type-available-p 'xpm)) | |
| 1164 "splash.xpm" "splash.pbm")))) | |
| 1165 (image-height (and img (cdr (image-size img)))) | |
| 1166 (window-height (1- (window-height (selected-window))))) | |
| 1167 (> window-height (+ image-height 14))))) | |
| 1168 | |
| 1169 | |
| 1156 (defun startup-echo-area-message () | 1170 (defun startup-echo-area-message () |
| 1157 (if (eq (key-binding "\C-h\C-p") 'describe-project) | 1171 (if (eq (key-binding "\C-h\C-p") 'describe-project) |
| 1158 "For information about the GNU Project and its goals, type C-h C-p." | 1172 "For information about the GNU Project and its goals, type C-h C-p." |
| 1159 (substitute-command-keys | 1173 (substitute-command-keys |
| 1160 "For information about the GNU Project and its goals, type \ | 1174 "For information about the GNU Project and its goals, type \ |
| 1239 (insert ", one component of a Linux-based GNU system.")) | 1253 (insert ", one component of a Linux-based GNU system.")) |
| 1240 (insert "\n") | 1254 (insert "\n") |
| 1241 | 1255 |
| 1242 (if (assq 'display (frame-parameters)) | 1256 (if (assq 'display (frame-parameters)) |
| 1243 | 1257 |
| 1244 (if (or (and (display-color-p) | 1258 (if (use-fancy-splash-screens-p) |
| 1245 (image-type-available-p 'xpm)) | |
| 1246 (image-type-available-p 'pbm)) | |
| 1247 (progn | 1259 (progn |
| 1248 (setq wait-for-input nil) | 1260 (setq wait-for-input nil) |
| 1249 (fancy-splash-screens)) | 1261 (fancy-splash-screens)) |
| 1250 (progn | 1262 (progn |
| 1251 (insert "\ | 1263 (insert "\ |