* startup.el (normal-splash-screen): Ensure splash buffer is

killed.  Use tabs in output.  Fix test whether previous buffer was
*scratch* buffer.

* progmodes/simula.el (simula-abbrev-keyword-default)
(simula-abbrev-keyword, simula-abbrev-stdproc-default)
(simula-abbrev-stdproc): Doc fix - escape open parens in column 0.

* apropos.el (command-apropos): Use `defalias' instead of `fset'.

* mail/rmail.el (rmail-speedbar-match-folder-regexp): Doc fix.

5 files changed, 115 insertions, 97 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 9575712a25f..b8fb1c8b246 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,17 @@
+2002-08-24  John Paul Wallington  <jpw@shootybangbang.com>
+
+        * startup.el (normal-splash-screen): Ensure splash buffer is
+        killed.  Use tabs in output.  Fix test whether previous buffer was
+        *scratch* buffer.
+
+        * progmodes/simula.el (simula-abbrev-keyword-default)
+        (simula-abbrev-keyword, simula-abbrev-stdproc-default)
+        (simula-abbrev-stdproc): Doc fix - escape open parens in column 0.
+        
+        * apropos.el (command-apropos): Use `defalias' instead of `fset'.
+
+        * mail/rmail.el (rmail-speedbar-match-folder-regexp): Doc fix.
+
 2002-08-23  Richard M. Stallman  <rms@gnu.org>
 
         * loadhist.el (unload-feature): Distinguish functions from
@@ -9,7 +23,7 @@
         * subr.el (symbol-file-load-history-loaded)
         (load-symbol-file-load-history): Deleted.
         (symbol-file): Don't call load-symbol-file-load-history.
-        
+
 2002-08-22  Katsumi Yamaoka <yamaoka@jpl.org>  (tiny change)
 
         * frame.el (select-frame-by-name, select-frame-set-input-focus):
diff --git a/lisp/apropos.el b/lisp/apropos.el
index 5f19f72ad8e..c91e4da82ae 100644
--- a/lisp/apropos.el
+++ b/lisp/apropos.el
@@ -372,7 +372,7 @@ normal variables."
 
 ;; For auld lang syne:
 ;;;###autoload
-(fset 'command-apropos 'apropos-command)
+(defalias 'command-apropos 'apropos-command)
 ;;;###autoload
 (defun apropos-command (apropos-regexp &optional do-all var-predicate)
   "Show commands (interactively callable functions) that match APROPOS-REGEXP.
diff --git a/lisp/mail/rmail.el b/lisp/mail/rmail.el
index eb984deff13..c4329cf9092 100644
--- a/lisp/mail/rmail.el
+++ b/lisp/mail/rmail.el
@@ -3597,7 +3597,7 @@ This has an effect only if a summary buffer exists."
 (eval-when-compile (require 'speedbar))
 
 (defvar rmail-speedbar-match-folder-regexp "^[A-Z0-9]+\\(\\.[A-Z0-9]+\\)?$"
-  "*This regex us used to match folder names to be displayed in speedbar.
+  "*This regex is used to match folder names to be displayed in speedbar.
 Enabling this will permit speedbar to display your folders for easy
 browsing, and moving of messages.")
 
diff --git a/lisp/progmodes/simula.el b/lisp/progmodes/simula.el
index ce546eb169f..ab3e9547120 100644
--- a/lisp/progmodes/simula.el
+++ b/lisp/progmodes/simula.el
@@ -129,24 +129,24 @@ and the cdr extra OTHERWISE indentation."
 (defconst simula-abbrev-keyword-default 'upcase
   "Specify how to convert case for SIMULA keywords.
 Value is one of the symbols `upcase', `downcase', `capitalize',
-(as in) `abbrev-table' or nil if they should not be changed.")
+\(as in) `abbrev-table' or nil if they should not be changed.")
 
 (defcustom simula-abbrev-keyword simula-abbrev-keyword-default
   "*Specify how to convert case for SIMULA keywords.
 Value is one of the symbols `upcase', `downcase', `capitalize',
-(as in) `abbrev-table' or nil if they should not be changed."
+\(as in) `abbrev-table' or nil if they should not be changed."
   :type '(choice (const upcase) (const downcase) (const capitalize)(const nil))
   :group 'simula)
 
 (defconst simula-abbrev-stdproc-default 'abbrev-table
   "Specify how to convert case for standard SIMULA procedure and class names.
 Value is one of the symbols `upcase', `downcase', `capitalize',
-(as in) `abbrev-table', or nil if they should not be changed.")
+\(as in) `abbrev-table', or nil if they should not be changed.")
 
 (defcustom simula-abbrev-stdproc simula-abbrev-stdproc-default
   "*Specify how to convert case for standard SIMULA procedure and class names.
 Value is one of the symbols `upcase', `downcase', `capitalize',
-(as in) `abbrev-table', or nil if they should not be changed."
+\(as in) `abbrev-table', or nil if they should not be changed."
   :type '(choice (const upcase) (const downcase) (const capitalize)
 (const abbrev-table) (const nil))
   :group 'simula)
diff --git a/lisp/startup.el b/lisp/startup.el
index 35927ebf03a..8afdb8c92f0 100644
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -1334,28 +1334,30 @@ we put it on this frame."
 
 (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 "\
+  (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,102 +1373,104 @@ Copying Conditions	Conditions for redistributing and changing Emacs.
 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) 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 "
+              ;; 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
+                (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]
+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 "
+                                 (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 "
 Activate menubar     \\[tmm-menubar]")))
 
-        ;; 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)
+                      "
 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
+              (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
 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"))
+            ;; 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)