[Emacs-diffs] Changes to emacs/lisp/startup.el

[John Paul Wallington]

Index: emacs/lisp/startup.el
diff -c emacs/lisp/startup.el:1.304 emacs/lisp/startup.el:1.305
*** emacs/lisp/startup.el:1.304 Wed Aug 14 17:46:21 2002
--- emacs/lisp/startup.el       Sat Aug 24 10:26:06 2002
***************
*** 1334,1361 ****
  
  (defun normal-splash-screen ()
    "Display splash screen when Emacs starts."
!   (with-current-buffer (get-buffer-create "GNU Emacs")
!     (let ((tab-width 8)
!         (mode-line-format (propertize "---- %b %-" 
!                                       'face '(:weight bold))))
! 
!       ;; The convention for this piece of code is that
!       ;; each piece of output starts with one or two newlines
!       ;; and does not end with any newlines.
!       (insert "Welcome to GNU Emacs")
!       (if (eq system-type 'gnu/linux)
!         (insert ", one component of a Linux-based GNU system."))
!       (insert "\n")
! 
!       (unless (equal (buffer-name (current-buffer)) "*scratch*")
!       (insert (substitute-command-keys
!                "\nType \\[recenter] to begin editing your file.\n")))
! 
!       (if (display-mouse-p)
!         ;; The user can use the mouse to activate menus
!         ;; so give help in terms of menu items.
!         (progn
!           (insert "\
  You can do basic editing with the menu bar and scroll bar using the mouse.
  
  Useful File menu items:
--- 1334,1363 ----
  
  (defun normal-splash-screen ()
    "Display splash screen when Emacs starts."
!   (let ((prev-buffer (current-buffer)))
!     (unwind-protect
!       (with-current-buffer (get-buffer-create "GNU Emacs")
!         (let ((tab-width 8)
!               (mode-line-format (propertize "---- %b %-" 
!                                             'face '(:weight bold))))
! 
!           ;; The convention for this piece of code is that
!           ;; each piece of output starts with one or two newlines
!           ;; and does not end with any newlines.
!           (insert "Welcome to GNU Emacs")
!           (if (eq system-type 'gnu/linux)
!               (insert ", one component of a Linux-based GNU system."))
!           (insert "\n")
! 
!           (unless (equal (buffer-name prev-buffer) "*scratch*")
!             (insert (substitute-command-keys
!                      "\nType \\[recenter] to begin editing your file.\n")))
! 
!           (if (display-mouse-p)
!               ;; The user can use the mouse to activate menus
!               ;; so give help in terms of menu items.
!               (progn
!                 (insert "\
  You can do basic editing with the menu bar and scroll bar using the mouse.
  
  Useful File menu items:
***************
*** 1371,1472 ****
  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)
!                           "
  Copyright (C) 2002 Free Software Foundation, Inc."))
  
!       ;; 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-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 "
  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
  Get help         %s
  Emacs manual     \\[info-emacs-manual]
! Emacs tutorial           \\[help-with-tutorial]   Undo changes   
\\[advertised-undo]
! Buy manuals        \\[view-order-manuals]   Exit Emacs           
\\[save-buffers-kill-emacs]
  Browse manuals     \\[info]"
!                          (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 "
  Activate menubar     \\[tmm-menubar]")))
  
!       ;; 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)
!                       "
  Copyright (C) 2002 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
  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
  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.
  
-       ;; 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))))
-   (kill-buffer "GNU Emacs"))
  
  (defun startup-echo-area-message ()
    (if (eq (key-binding "\C-h\C-p") 'describe-project)
--- 1373,1476 ----
  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)
!                         "
  Copyright (C) 2002 Free Software Foundation, Inc."))
  
!             ;; 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-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 "
  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
  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]
  Browse manuals     \\[info]"
!                                (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 "
  Activate menubar     \\[tmm-menubar]")))
  
!             ;; 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)
!                     "
  Copyright (C) 2002 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
  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
  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.
! 
!           ;; 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 ()
    (if (eq (key-binding "\C-h\C-p") 'describe-project)