From: Karoly Lorentey Date: Mon, 10 Apr 2006 14:52:24 +0000 (+0000) Subject: Merged from X-Git-Tag: emacs-pretest-23.0.90~11236^2~141^2~58 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=e349ae3b6b6db99d11321622fadff88bc42c1125;p=emacs.git Merged from Patches applied: * emacs@sv.gnu.org/emacs--devo--0--patch-188 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-189 Merge from gnus--rel--5.10 * emacs@sv.gnu.org/emacs--devo--0--patch-190 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-191 Undo incorrect merge of etc/images/README from Gnus 5.10 * emacs@sv.gnu.org/emacs--devo--0--patch-192 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-193 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-194 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-195 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-196 Merge from gnus--rel--5.10 * emacs@sv.gnu.org/emacs--devo--0--patch-197 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-198 Merge from gnus--rel--5.10 * emacs@sv.gnu.org/emacs--devo--0--patch-199 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-200 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-201 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-202 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-203 Merge from gnus--rel--5.10 * emacs@sv.gnu.org/emacs--devo--0--patch-204 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-205 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-206 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-73 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-74 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-75 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-76 Update from CVS: README: Addition from 5.10.6 tar ball. * emacs@sv.gnu.org/gnus--rel--5.10--patch-77 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-78 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-79 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-80 Update from CVS git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-547 --- e349ae3b6b6db99d11321622fadff88bc42c1125 diff --cc lisp/startup.el index 1e7032efe44,6fdd4fa4999..e677e7cc54b --- a/lisp/startup.el +++ b/lisp/startup.el @@@ -1361,11 -1364,9 +1363,12 @@@ mouse. (recursive-edit)) (cancel-timer timer) (setq display-hourglass old-hourglass - minor-mode-map-alist old-minor-mode-map-alist) + minor-mode-map-alist old-minor-mode-map-alist + emulation-mode-map-alists old-emulation-mode-map-alists) - (kill-buffer splash-buffer)))))) + (kill-buffer splash-buffer) + (when (frame-live-p frame) + (select-frame frame) + (switch-to-buffer fancy-splash-outer-buffer))))))) (defun fancy-splash-frame () "Return the frame to use for the fancy splash screen. @@@ -1440,103 -1442,111 +1444,103 @@@ Copying Conditions Conditions for redis Getting New Versions How to obtain the latest version of Emacs More Manuals / Ordering Manuals How to order printed manuals from the FSF ") - (insert "\n\n" (emacs-version) - " + (insert "\n\n" (emacs-version) + " Copyright (C) 2006 Free Software Foundation, Inc.")) - ;; No mouse menus, so give help using kbd commands. - ;; No mouse menus, so give help using kbd commands. -- - ;; If keys have their default meanings, - ;; use precomputed string to save lots of time. - (if (and (eq (key-binding "\C-h") 'help-command) - (eq (key-binding "\C-xu") 'advertised-undo) - (eq (key-binding "\C-x\C-c") 'save-buffers-kill-terminal) - (eq (key-binding "\C-ht") 'help-with-tutorial) - (eq (key-binding "\C-hi") 'info) - (eq (key-binding "\C-hr") 'info-emacs-manual) - (eq (key-binding "\C-h\C-n") 'view-emacs-news)) - (insert " - ;; If keys have their default meanings, - ;; use precomputed string to save lots of time. - (if (and (eq (key-binding "\C-h") 'help-command) - (eq (key-binding "\C-xu") 'advertised-undo) - (eq (key-binding "\C-x\C-c") 'save-buffers-kill-emacs) - (eq (key-binding "\C-ht") 'help-with-tutorial) - (eq (key-binding "\C-hi") 'info) - (eq (key-binding "\C-hr") 'info-emacs-manual) - (eq (key-binding "\C-h\C-n") 'view-emacs-news)) - (insert " ++ ;; No mouse menus, so give help using kbd commands. ++ ++ ;; If keys have their default meanings, ++ ;; use precomputed string to save lots of time. ++ (if (and (eq (key-binding "\C-h") 'help-command) ++ (eq (key-binding "\C-xu") 'advertised-undo) ++ (eq (key-binding "\C-x\C-c") 'save-buffers-kill-terminal) ++ (eq (key-binding "\C-ht") 'help-with-tutorial) ++ (eq (key-binding "\C-hi") 'info) ++ (eq (key-binding "\C-hr") 'info-emacs-manual) ++ (eq (key-binding "\C-h\C-n") 'view-emacs-news)) ++ (insert " Get help C-h (Hold down CTRL and press h) Emacs manual C-h r Emacs tutorial C-h t Undo changes C-x u Buy manuals C-h C-m Exit Emacs C-x C-c Browse manuals C-h i") - (insert (substitute-command-keys - (format "\n - (insert (substitute-command-keys - (format "\n ++ (insert (substitute-command-keys ++ (format "\n Get help %s Emacs manual \\[info-emacs-manual] Emacs tutorial \\[help-with-tutorial]\tUndo changes\t\\[advertised-undo] -Buy manuals \\[view-order-manuals]\tExit Emacs\t\\[save-buffers-kill-emacs] +Buy manuals \\[view-order-manuals]\tExit Emacs\t\\[save-buffers-kill-terminal] Browse manuals \\[info]" - (let ((where (where-is-internal - 'help-command nil t))) - (if where - (key-description where) - "M-x help")))))) - (let ((where (where-is-internal - 'help-command nil t))) - (if where - (key-description where) - "M-x help")))))) -- - ;; Say how to use the menu bar with the keyboard. - (if (and (eq (key-binding "\M-`") 'tmm-menubar) - (eq (key-binding [f10]) 'tmm-menubar)) - (insert " - ;; Say how to use the menu bar with the keyboard. - (if (and (eq (key-binding "\M-`") 'tmm-menubar) - (eq (key-binding [f10]) 'tmm-menubar)) - (insert " ++ (let ((where (where-is-internal ++ 'help-command nil t))) ++ (if where ++ (key-description where) ++ "M-x help")))))) ++ ++ ;; Say how to use the menu bar with the keyboard. ++ (if (and (eq (key-binding "\M-`") 'tmm-menubar) ++ (eq (key-binding [f10]) 'tmm-menubar)) ++ (insert " Activate menubar F10 or ESC ` or M-`") - (insert (substitute-command-keys " - (insert (substitute-command-keys " ++ (insert (substitute-command-keys " Activate menubar \\[tmm-menubar]"))) - ;; Many users seem to have problems with these. - (insert " - ;; Many users seem to have problems with these. - (insert " ++ ;; Many users seem to have problems with these. ++ (insert " \(`C-' means use the CTRL key. `M-' means use the Meta (or Alt) key. If you have no Meta key, you may instead type ESC followed by the character.)") - (insert "\n\n" (emacs-version) - " - (insert "\n\n" (emacs-version) - " ++ (insert "\n\n" (emacs-version) ++ " Copyright (C) 2006 Free Software Foundation, Inc.") - (if (and (eq (key-binding "\C-h\C-c") 'describe-copying) - (eq (key-binding "\C-h\C-d") 'describe-distribution) - (eq (key-binding "\C-h\C-w") 'describe-no-warranty)) - (insert - "\n - (if (and (eq (key-binding "\C-h\C-c") 'describe-copying) - (eq (key-binding "\C-h\C-d") 'describe-distribution) - (eq (key-binding "\C-h\C-w") 'describe-no-warranty)) - (insert - "\n ++ (if (and (eq (key-binding "\C-h\C-c") 'describe-copying) ++ (eq (key-binding "\C-h\C-d") 'describe-distribution) ++ (eq (key-binding "\C-h\C-w") 'describe-no-warranty)) ++ (insert ++ "\n GNU Emacs comes with ABSOLUTELY NO WARRANTY; type C-h C-w for full details. Emacs is Free Software--Free as in Freedom--so you can redistribute copies of Emacs and modify it; type C-h C-c to see the conditions. Type C-h C-d for information on getting the latest version.") - (insert (substitute-command-keys - "\n - (insert (substitute-command-keys - "\n ++ (insert (substitute-command-keys ++ "\n GNU Emacs comes with ABSOLUTELY NO WARRANTY; type \\[describe-no-warranty] for full details. Emacs is Free Software--Free as in Freedom--so you can redistribute copies of Emacs and modify it; type \\[describe-copying] to see the conditions. Type \\[describe-distribution] for information on getting the latest version.")))) - ;; The rest of the startup screen is the same on all - ;; kinds of terminals. - ;; The rest of the startup screen is the same on all - ;; kinds of terminals. -- - ;; Give information on recovering, if there was a crash. - (and auto-save-list-file-prefix - ;; Don't signal an error if the - ;; directory for auto-save-list files - ;; does not yet exist. - (file-directory-p (file-name-directory - auto-save-list-file-prefix)) - (directory-files - (file-name-directory auto-save-list-file-prefix) - nil - (concat "\\`" - (regexp-quote (file-name-nondirectory - auto-save-list-file-prefix))) - t) - (insert "\n\nIf an Emacs session crashed recently, " - "type M-x recover-session RET\nto recover" - " the files you were editing.")) - ;; Give information on recovering, if there was a crash. - (and auto-save-list-file-prefix - ;; Don't signal an error if the - ;; directory for auto-save-list files - ;; does not yet exist. - (file-directory-p (file-name-directory - auto-save-list-file-prefix)) - (directory-files - (file-name-directory auto-save-list-file-prefix) - nil - (concat "\\`" - (regexp-quote (file-name-nondirectory - auto-save-list-file-prefix))) - t) - (insert "\n\nIf an Emacs session crashed recently, " - "type M-x recover-session RET\nto recover" - " the files you were editing.")) -- - ;; Display the input that we set up in the buffer. - (set-buffer-modified-p nil) - (goto-char (point-min)) - (save-window-excursion - (switch-to-buffer (current-buffer)) - (sit-for 120)))) - ;; Display the input that we set up in the buffer. - (set-buffer-modified-p nil) - (goto-char (point-min)) - (save-window-excursion - (condition-case nil - (switch-to-buffer (current-buffer)) - ;; In case we're in a dedicated or minibuffer-only window. - (error - ;; There's no point is using pop-to-buffer since creating - ;; a new frame will generate enough events that the - ;; subsequent `sit-for' will immediately return anyway. - ;; (pop-to-buffer (current-buffer)) - )) - (sit-for 120))) -- ;; Unwind ... ensure splash buffer is killed -- (kill-buffer "GNU Emacs")))) ++ ;; The rest of the startup screen is the same on all ++ ;; kinds of terminals. ++ ++ ;; Give information on recovering, if there was a crash. ++ (and auto-save-list-file-prefix ++ ;; Don't signal an error if the ++ ;; directory for auto-save-list files ++ ;; does not yet exist. ++ (file-directory-p (file-name-directory ++ auto-save-list-file-prefix)) ++ (directory-files ++ (file-name-directory auto-save-list-file-prefix) ++ nil ++ (concat "\\`" ++ (regexp-quote (file-name-nondirectory ++ auto-save-list-file-prefix))) ++ t) ++ (insert "\n\nIf an Emacs session crashed recently, " ++ "type M-x recover-session RET\nto recover" ++ " the files you were editing.")) ++ ++ ;; Display the input that we set up in the buffer. ++ (set-buffer-modified-p nil) ++ (goto-char (point-min)) ++ (save-window-excursion ++ (switch-to-buffer (current-buffer)) ++ (sit-for 120)))) ++ ;; Unwind ... ensure splash buffer is killed ++ (kill-buffer "GNU Emacs")))) (defun startup-echo-area-message ()