Mercurial > emacs

comparison lisp/startup.el @ 83542:2d56e13fd23d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merged from emacs@sv.gnu.org Patches applied: * emacs@sv.gnu.org/emacs--devo--0--patch-413 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-414 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-415 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-416 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-417 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-418 Merge from gnus--rel--5.10 * emacs@sv.gnu.org/emacs--devo--0--patch-419 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-420 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-421 Merge from gnus--rel--5.10 * emacs@sv.gnu.org/emacs--devo--0--patch-422 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-423 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-424 Merge from gnus--rel--5.10 * emacs@sv.gnu.org/emacs--devo--0--patch-425 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-426 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-427 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-428 Merge from gnus--rel--5.10 * emacs@sv.gnu.org/emacs--devo--0--patch-429 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-430 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-431 Merge from gnus--rel--5.10 * emacs@sv.gnu.org/emacs--devo--0--patch-432 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-433 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-434 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-435 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-436 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-437 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-438 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-439 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-440 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-441 lisp/url/url-methods.el: Fix format error when http_proxy is empty string * emacs@sv.gnu.org/emacs--devo--0--patch-442 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-443 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-444 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-445 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-446 Merge from gnus--rel--5.10 * emacs@sv.gnu.org/emacs--devo--0--patch-447 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-448 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-449 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-450 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-451 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-452 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-453 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-454 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-455 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-456 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-457 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-458 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-459 Merge from gnus--rel--5.10 * emacs@sv.gnu.org/emacs--devo--0--patch-460 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-461 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-462 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-463 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-464 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-465 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-466 Merge from gnus--rel--5.10 * emacs@sv.gnu.org/emacs--devo--0--patch-467 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-468 Merge from gnus--rel--5.10 * emacs@sv.gnu.org/emacs--devo--0--patch-469 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-470 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-471 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-472 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-473 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-128 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-129 Merge from emacs--devo--0 * emacs@sv.gnu.org/gnus--rel--5.10--patch-130 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-131 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-132 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-133 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-134 Merge from emacs--devo--0 * emacs@sv.gnu.org/gnus--rel--5.10--patch-135 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-136 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-137 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-138 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-139 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-140 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-141 Merge from emacs--devo--0 * emacs@sv.gnu.org/gnus--rel--5.10--patch-142 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-143 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-144 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-145 Merge from emacs--devo--0 * emacs@sv.gnu.org/gnus--rel--5.10--patch-146 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-147 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-148 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-149 Update from CVS git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-582
author Karoly Lorentey <lorentey@elte.hu>
date Sat, 14 Oct 2006 17:36:28 +0000
parents 694bbb62a75d 5cb689e83be2
children c71725faff1a
comparison
equal deleted inserted replaced
83541:694bbb62a75d 83542:2d56e13fd23d
782 (custom-reevaluate-setting 'global-font-lock-mode) 782 (custom-reevaluate-setting 'global-font-lock-mode)
783 (custom-reevaluate-setting 'mouse-wheel-down-event) 783 (custom-reevaluate-setting 'mouse-wheel-down-event)
784 (custom-reevaluate-setting 'mouse-wheel-up-event) 784 (custom-reevaluate-setting 'mouse-wheel-up-event)
785 (custom-reevaluate-setting 'file-name-shadow-mode) 785 (custom-reevaluate-setting 'file-name-shadow-mode)
786 (custom-reevaluate-setting 'send-mail-function) 786 (custom-reevaluate-setting 'send-mail-function)
787 (custom-reevaluate-setting 'focus-follows-mouse)
787 788
788 (normal-erase-is-backspace-setup-frame) 789 (normal-erase-is-backspace-setup-frame)
789 790
790 ;; Register default TTY colors for the case the terminal hasn't a 791 ;; Register default TTY colors for the case the terminal hasn't a
791 ;; terminal init file. We do this regardles of whether the terminal 792 ;; terminal init file. We do this regardles of whether the terminal
1095 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; 1096 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
1096 ;;; Fancy splash screen 1097 ;;; Fancy splash screen
1097 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; 1098 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
1098 1099
1099 (defvar fancy-splash-text 1100 (defvar fancy-splash-text
1100 '((:face variable-pitch 1101 '((:face (variable-pitch :weight bold)
1101 "You can do basic editing with the menu bar and scroll bar \
1102 using the mouse.\n\n"
1103 :face (variable-pitch :weight bold)
1104 "Important Help menu items:\n" 1102 "Important Help menu items:\n"
1105 :face variable-pitch 1103 :face variable-pitch
1106 (lambda () 1104 (lambda ()
1107 (let* ((en "TUTORIAL") 1105 (let* ((en "TUTORIAL")
1108 (tut (or (get-language-info current-language-environment 1106 (tut (or (get-language-info current-language-environment
1122 "" 1120 ""
1123 (concat " (" title ")")) 1121 (concat " (" title ")"))
1124 "\n"))) 1122 "\n")))
1125 :face variable-pitch "\ 1123 :face variable-pitch "\
1126 Emacs FAQ\tFrequently asked questions and answers 1124 Emacs FAQ\tFrequently asked questions and answers
1127 Read the Emacs Manual\tView the Emacs manual using Info 1125 View Emacs Manual\tView the Emacs manual using Info
1128 \(Non)Warranty\tGNU Emacs comes with " 1126 Absence of Warranty\tGNU Emacs comes with "
1129 :face (variable-pitch :slant oblique) 1127 :face (variable-pitch :slant oblique)
1130 "ABSOLUTELY NO WARRANTY\n" 1128 "ABSOLUTELY NO WARRANTY\n"
1131 :face variable-pitch 1129 :face variable-pitch
1132 "\ 1130 "\
1133 Copying Conditions\tConditions for redistributing and changing Emacs 1131 Copying Conditions\tConditions for redistributing and changing Emacs
1134 Getting New Versions\tHow to obtain the latest version of Emacs 1132 Getting New Versions\tHow to obtain the latest version of Emacs
1135 More Manuals / Ordering Manuals Buying printed manuals from the FSF\n") 1133 More Manuals / Ordering Manuals Buying printed manuals from the FSF\n")
1136 (:face variable-pitch 1134 (:face (variable-pitch :weight bold)
1137 "You can do basic editing with the menu bar and scroll bar \ 1135 "Useful File menu items:\n"
1138 using the mouse.\n\n" 1136 :face variable-pitch "\
1139 :face (variable-pitch :weight bold) 1137 Exit Emacs\t\t(Or type Control-x followed by Control-c)
1140 "Useful File menu items:\n"
1141 :face variable-pitch "\
1142 Exit Emacs\t(Or type Control-x followed by Control-c)
1143 Recover Crashed Session\tRecover files you were editing before a crash 1138 Recover Crashed Session\tRecover files you were editing before a crash
1139
1144 1140
1145 1141
1146 1142
1147 1143
1148 " 1144 "
1247 :face '(variable-pitch :foreground "red") 1243 :face '(variable-pitch :foreground "red")
1248 (if (eq system-type 'gnu/linux) 1244 (if (eq system-type 'gnu/linux)
1249 "GNU Emacs is one component of the GNU/Linux operating system." 1245 "GNU Emacs is one component of the GNU/Linux operating system."
1250 "GNU Emacs is one component of the GNU operating system.")) 1246 "GNU Emacs is one component of the GNU operating system."))
1251 (insert "\n") 1247 (insert "\n")
1248 (fancy-splash-insert
1249 :face 'variable-pitch
1250 "You can do basic editing with the menu bar and scroll bar \
1251 using the mouse.\n\n")
1252 (if fancy-splash-outer-buffer 1252 (if fancy-splash-outer-buffer
1253 (fancy-splash-insert 1253 (fancy-splash-insert
1254 :face 'variable-pitch 1254 :face 'variable-pitch
1255 (substitute-command-keys 1255 (substitute-command-keys
1256 (concat 1256 (concat
1283 (regexp-quote (file-name-nondirectory 1283 (regexp-quote (file-name-nondirectory
1284 auto-save-list-file-prefix))) 1284 auto-save-list-file-prefix)))
1285 t) 1285 t)
1286 (fancy-splash-insert :face '(variable-pitch :foreground "red") 1286 (fancy-splash-insert :face '(variable-pitch :foreground "red")
1287 "\n\nIf an Emacs session crashed recently, " 1287 "\n\nIf an Emacs session crashed recently, "
1288 "type M-x recover-session RET\nto recover" 1288 "type Meta-x recover-session RET\nto recover"
1289 " the files you were editing.")))) 1289 " the files you were editing."))))
1290 1290
1291 (defun fancy-splash-screens-1 (buffer) 1291 (defun fancy-splash-screens-1 (buffer)
1292 "Timer function displaying a splash screen." 1292 "Timer function displaying a splash screen."
1293 (when (> (float-time) fancy-splash-stop-time) 1293 (when (> (float-time) fancy-splash-stop-time)
1338 (if (frame-live-p frame) 1338 (if (frame-live-p frame)
1339 (run-at-time 0 nil 'fancy-splash-exit))) 1339 (run-at-time 0 nil 'fancy-splash-exit)))
1340 1340
1341 (defun fancy-splash-screens (&optional hide-on-input) 1341 (defun fancy-splash-screens (&optional hide-on-input)
1342 "Display fancy splash screens when Emacs starts." 1342 "Display fancy splash screens when Emacs starts."
1343 (setq fancy-splash-help-echo (startup-echo-area-message))
1344 (if hide-on-input 1343 (if hide-on-input
1345 (let ((old-hourglass display-hourglass) 1344 (let ((old-hourglass display-hourglass)
1346 (fancy-splash-outer-buffer (current-buffer)) 1345 (fancy-splash-outer-buffer (current-buffer))
1347 splash-buffer 1346 splash-buffer
1348 (old-minor-mode-map-alist minor-mode-map-alist) 1347 (old-minor-mode-map-alist minor-mode-map-alist)
1350 (frame (fancy-splash-frame)) 1349 (frame (fancy-splash-frame))
1351 timer) 1350 timer)
1352 (save-selected-window 1351 (save-selected-window
1353 (select-frame frame) 1352 (select-frame frame)
1354 (switch-to-buffer "GNU Emacs") 1353 (switch-to-buffer "GNU Emacs")
1355 (setq tab-width 20)
1356 (setq splash-buffer (current-buffer)) 1354 (setq splash-buffer (current-buffer))
1357 (catch 'stop-splashing 1355 (catch 'stop-splashing
1358 (unwind-protect 1356 (unwind-protect
1359 (let* ((map (make-sparse-keymap)) 1357 (let* ((map (make-sparse-keymap))
1358 (cursor-type nil)
1360 (overriding-local-map map) 1359 (overriding-local-map map)
1361 ;; Catch if our frame is deleted; the delete-frame 1360 ;; Catch if our frame is deleted; the delete-frame
1362 ;; event is unreliable and is handled by 1361 ;; event is unreliable and is handled by
1363 ;; `special-event-map' anyway. 1362 ;; `special-event-map' anyway.
1364 (delete-frame-functions (cons 'fancy-splash-delete-frame 1363 (delete-frame-functions (cons 'fancy-splash-delete-frame
1365 delete-frame-functions))) 1364 delete-frame-functions)))
1366 (define-key map [t] 'fancy-splash-default-action) 1365 (define-key map [t] 'fancy-splash-default-action)
1367 (define-key map [mouse-movement] 'ignore) 1366 (define-key map [mouse-movement] 'ignore)
1368 (define-key map [mode-line t] 'ignore) 1367 (define-key map [mode-line t] 'ignore)
1369 (define-key map [select-window] 'ignore) 1368 (define-key map [select-window] 'ignore)
1370 (setq cursor-type nil 1369 (setq display-hourglass nil
1371 display-hourglass nil
1372 minor-mode-map-alist nil 1370 minor-mode-map-alist nil
1373 emulation-mode-map-alists nil 1371 emulation-mode-map-alists nil
1374 buffer-undo-list t 1372 buffer-undo-list t
1375 mode-line-format (propertize "---- %b %-" 1373 mode-line-format (propertize "---- %b %-"
1376 'face 'mode-line-buffer-id) 1374 'face 'mode-line-buffer-id)
1377 fancy-splash-stop-time (+ (float-time) 1375 fancy-splash-stop-time (+ (float-time)
1378 fancy-splash-max-time) 1376 fancy-splash-max-time)
1379 timer (run-with-timer 0 fancy-splash-delay 1377 timer (run-with-timer 0 fancy-splash-delay
1380 #'fancy-splash-screens-1 1378 #'fancy-splash-screens-1
1381 splash-buffer)) 1379 splash-buffer))
1380 (message "%s" (startup-echo-area-message))
1382 (recursive-edit)) 1381 (recursive-edit))
1383 (cancel-timer timer) 1382 (cancel-timer timer)
1384 (setq display-hourglass old-hourglass 1383 (setq display-hourglass old-hourglass
1385 minor-mode-map-alist old-minor-mode-map-alist 1384 minor-mode-map-alist old-minor-mode-map-alist
1386 emulation-mode-map-alists old-emulation-mode-map-alists) 1385 emulation-mode-map-alists old-emulation-mode-map-alists)
1387 (kill-buffer splash-buffer) 1386 (kill-buffer splash-buffer)
1388 (when (frame-live-p frame) 1387 (when (frame-live-p frame)
1389 (select-frame frame) 1388 (select-frame frame)
1390 (switch-to-buffer fancy-splash-outer-buffer)))))) 1389 (switch-to-buffer fancy-splash-outer-buffer))))))
1391 ;; If hide-on-input is non-nil, don't hide the buffer on input. 1390 ;; If hide-on-input is nil, don't hide the buffer on input.
1392 (if (or (window-minibuffer-p) 1391 (if (or (window-minibuffer-p)
1393 (window-dedicated-p (selected-window))) 1392 (window-dedicated-p (selected-window)))
1394 (pop-to-buffer (current-buffer)) 1393 (pop-to-buffer (current-buffer))
1395 (switch-to-buffer "GNU Emacs")) 1394 (switch-to-buffer "*About GNU Emacs*"))
1395 (setq buffer-read-only nil)
1396 (erase-buffer) 1396 (erase-buffer)
1397 (if pure-space-overflow 1397 (if pure-space-overflow
1398 (insert "\ 1398 (insert "\
1399 Warning Warning!!! Pure space overflow !!!Warning Warning 1399 Warning Warning!!! Pure space overflow !!!Warning Warning
1400 \(See the node Pure Storage in the Lisp manual for details.)\n")) 1400 \(See the node Pure Storage in the Lisp manual for details.)\n"))
1401 (let (fancy-splash-outer-buffer) 1401 (let (fancy-splash-outer-buffer)
1402 (fancy-splash-head) 1402 (fancy-splash-head)
1403 (dolist (text fancy-splash-text) 1403 (dolist (text fancy-splash-text)
1404 (apply #'fancy-splash-insert text)) 1404 (apply #'fancy-splash-insert text)
1405 (insert "\n"))
1406 (skip-chars-backward "\n")
1407 (delete-region (point) (point-max))
1408 (insert "\n")
1405 (fancy-splash-tail) 1409 (fancy-splash-tail)
1406 (set-buffer-modified-p nil) 1410 (set-buffer-modified-p nil)
1411 (setq buffer-read-only t)
1412 (if (and view-read-only (not view-mode))
1413 (view-mode-enter nil 'kill-buffer))
1407 (goto-char (point-min))))) 1414 (goto-char (point-min)))))
1408 1415
1409 1416
1410 (defun fancy-splash-frame () 1417 (defun fancy-splash-frame ()
1411 "Return the frame to use for the fancy splash screen. 1418 "Return the frame to use for the fancy splash screen.
1439 (defun normal-splash-screen (&optional hide-on-input) 1446 (defun normal-splash-screen (&optional hide-on-input)
1440 "Display splash screen when Emacs starts." 1447 "Display splash screen when Emacs starts."
1441 (let ((prev-buffer (current-buffer))) 1448 (let ((prev-buffer (current-buffer)))
1442 (unwind-protect 1449 (unwind-protect
1443 (with-current-buffer (get-buffer-create "GNU Emacs") 1450 (with-current-buffer (get-buffer-create "GNU Emacs")
1451 (setq buffer-read-only nil)
1444 (erase-buffer) 1452 (erase-buffer)
1445 (set (make-local-variable 'tab-width) 8) 1453 (set (make-local-variable 'tab-width) 8)
1446 (if hide-on-input 1454 (if hide-on-input
1447 (set (make-local-variable 'mode-line-format) 1455 (set (make-local-variable 'mode-line-format)
1448 (propertize "---- %b %-" 'face 'mode-line-buffer-id))) 1456 (propertize "---- %b %-" 'face 'mode-line-buffer-id)))
1573 (concat "\\`" 1581 (concat "\\`"
1574 (regexp-quote (file-name-nondirectory 1582 (regexp-quote (file-name-nondirectory
1575 auto-save-list-file-prefix))) 1583 auto-save-list-file-prefix)))
1576 t) 1584 t)
1577 (insert "\n\nIf an Emacs session crashed recently, " 1585 (insert "\n\nIf an Emacs session crashed recently, "
1578 "type M-x recover-session RET\nto recover" 1586 "type Meta-x recover-session RET\nto recover"
1579 " the files you were editing.")) 1587 " the files you were editing."))
1580 1588
1581 ;; Display the input that we set up in the buffer. 1589 ;; Display the input that we set up in the buffer.
1582 (set-buffer-modified-p nil) 1590 (set-buffer-modified-p nil)
1591 (setq buffer-read-only t)
1592 (if (and view-read-only (not view-mode))
1593 (view-mode-enter nil 'kill-buffer))
1583 (goto-char (point-min)) 1594 (goto-char (point-min))
1584 (if (or (window-minibuffer-p) 1595 (if hide-on-input
1585 (window-dedicated-p (selected-window))) 1596 (if (or (window-minibuffer-p)
1586 ;; If hide-on-input is nil, creating a new frame will 1597 (window-dedicated-p (selected-window)))
1587 ;; generate enough events that the subsequent `sit-for' 1598 ;; If hide-on-input is nil, creating a new frame will
1588 ;; will immediately return anyway. 1599 ;; generate enough events that the subsequent `sit-for'
1589 (pop-to-buffer (current-buffer)) 1600 ;; will immediately return anyway.
1590 (if hide-on-input 1601 nil ;; (pop-to-buffer (current-buffer))
1591 (save-window-excursion 1602 (save-window-excursion
1592 (switch-to-buffer (current-buffer)) 1603 (switch-to-buffer (current-buffer))
1593 (sit-for 120)) 1604 (sit-for 120))
1594 (switch-to-buffer (current-buffer))))) 1605 (condition-case nil
1606 (switch-to-buffer (current-buffer))))))
1595 ;; Unwind ... ensure splash buffer is killed 1607 ;; Unwind ... ensure splash buffer is killed
1596 (if hide-on-input 1608 (if hide-on-input
1597 (kill-buffer "GNU Emacs"))))) 1609 (kill-buffer "GNU Emacs")
1610 (switch-to-buffer "GNU Emacs")
1611 (rename-buffer "*About GNU Emacs*" t)))))
1598 1612
1599 1613
1600 (defun startup-echo-area-message () 1614 (defun startup-echo-area-message ()
1601 (if (eq (key-binding "\C-h\C-p") 'describe-project) 1615 (if (eq (key-binding "\C-h\C-p") 'describe-project)
1602 "For information about the GNU Project and its goals, type C-h C-p." 1616 "For information about the GNU Project and its goals, type C-h C-p."
1649 1663
1650 1664
1651 (defun display-splash-screen (&optional hide-on-input) 1665 (defun display-splash-screen (&optional hide-on-input)
1652 "Display splash screen according to display. 1666 "Display splash screen according to display.
1653 Fancy splash screens are used on graphic displays, 1667 Fancy splash screens are used on graphic displays,
1654 normal otherwise." 1668 normal otherwise.
1655 (interactive) 1669 With a prefix argument, any user input hides the splash screen."
1670 (interactive "P")
1656 ;; Prevent recursive calls from server-process-filter. 1671 ;; Prevent recursive calls from server-process-filter.
1657 (if (not (get-buffer "GNU Emacs")) 1672 (if (not (get-buffer "GNU Emacs"))
1658 (if (use-fancy-splash-screens-p) 1673 (if (use-fancy-splash-screens-p)
1659 (fancy-splash-screens hide-on-input) 1674 (fancy-splash-screens hide-on-input)
1660 (normal-splash-screen hide-on-input)))) 1675 (normal-splash-screen hide-on-input))))