Mercurial > emacs
comparison lisp/startup.el @ 79571:d08060a6f18a
(fancy-splash-help-echo): Var deleted.
(fancy-splash-insert): Get help-echo from (startup-echo-area-message).
(fancy-about-screen): Don't display fancy-splash-help-echo.
| author | Richard M. Stallman <rms@gnu.org> |
|---|---|
| date | Sat, 15 Dec 2007 22:33:43 +0000 |
| parents | 0d2b02ad7d19 |
| children | 6805f3089622 cdd30283527d |
comparison
equal
deleted
inserted
replaced
| 79570:d01c76d7e07b | 79571:d08060a6f18a |
|---|---|
| 1286 map) | 1286 map) |
| 1287 "Keymap for splash screen buffer.") | 1287 "Keymap for splash screen buffer.") |
| 1288 | 1288 |
| 1289 ;; These are temporary storage areas for the splash screen display. | 1289 ;; These are temporary storage areas for the splash screen display. |
| 1290 | 1290 |
| 1291 (defvar fancy-splash-help-echo nil) | |
| 1292 | |
| 1293 (defun fancy-splash-insert (&rest args) | 1291 (defun fancy-splash-insert (&rest args) |
| 1294 "Insert text into the current buffer, with faces. | 1292 "Insert text into the current buffer, with faces. |
| 1295 Arguments from ARGS should be either strings; functions called | 1293 Arguments from ARGS should be either strings; functions called |
| 1296 with no args that return a string; pairs `:face FACE', where FACE | 1294 with no args that return a string; pairs `:face FACE', where FACE |
| 1297 is a face specification usable with `put-text-property'; or pairs | 1295 is a face specification usable with `put-text-property'; or pairs |
| 1321 (t (insert (propertize (let ((it (car args))) | 1319 (t (insert (propertize (let ((it (car args))) |
| 1322 (if (functionp it) | 1320 (if (functionp it) |
| 1323 (funcall it) | 1321 (funcall it) |
| 1324 it)) | 1322 it)) |
| 1325 'face current-face | 1323 'face current-face |
| 1326 'help-echo fancy-splash-help-echo)))) | 1324 'help-echo (startup-echo-area-message))))) |
| 1327 (setq args (cdr args))))) | 1325 (setq args (cdr args))))) |
| 1328 | 1326 |
| 1329 | 1327 |
| 1330 (defun fancy-splash-head () | 1328 (defun fancy-splash-head () |
| 1331 "Insert the head part of the splash screen into the current buffer." | 1329 "Insert the head part of the splash screen into the current buffer." |
| 1503 (insert pure-space-overflow-message)) | 1501 (insert pure-space-overflow-message)) |
| 1504 (fancy-splash-head) | 1502 (fancy-splash-head) |
| 1505 (dolist (text fancy-about-text) | 1503 (dolist (text fancy-about-text) |
| 1506 (apply #'fancy-splash-insert text) | 1504 (apply #'fancy-splash-insert text) |
| 1507 (insert "\n")) | 1505 (insert "\n")) |
| 1508 (unless (current-message) | |
| 1509 (message fancy-splash-help-echo)) | |
| 1510 (set-buffer-modified-p nil) | 1506 (set-buffer-modified-p nil) |
| 1511 (goto-char (point-min)) | 1507 (goto-char (point-min)) |
| 1512 (force-mode-line-update)) | 1508 (force-mode-line-update)) |
| 1513 (use-local-map splash-screen-keymap) | 1509 (use-local-map splash-screen-keymap) |
| 1514 (setq tab-width 22) | 1510 (setq tab-width 22) |