* startup.el (fancy-splash-text): Move editing instructions to

	fancy-splash-head.
	(fancy-splash-head): Issue editing instructions.
	(fancy-splash-screens): Fixup whitespace.

2 files changed, 21 insertions, 11 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e2aca88e681..fde192f0215 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+2006-09-14  Chong Yidong  <cyd@stupidchicken.com>
+
+        * startup.el (fancy-splash-text): Move editing instructions to
+        fancy-splash-head.
+        (fancy-splash-head): Issue editing instructions.
+        (fancy-splash-screens): Fixup whitespace.
+
 2006-09-14  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * bindings.el (mode-line-buffer-identification-keymap):
diff --git a/lisp/startup.el b/lisp/startup.el
index bc51b4ee037..c1adf617aa4 100644
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -1113,10 +1113,7 @@ regardless of the value of this variable."
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
 (defvar fancy-splash-text
-  '((:face variable-pitch
-           "You can do basic editing with the menu bar and scroll bar \
-using the mouse.\n\n"
-           :face (variable-pitch :weight bold)
+  '((:face (variable-pitch :weight bold)
            "Important Help menu items:\n"
            :face variable-pitch
            (lambda ()
@@ -1149,18 +1146,16 @@ Read the Emacs Manual\tView the Emacs manual using Info
 Copying Conditions\tConditions for redistributing and changing Emacs
 Getting New Versions\tHow to obtain the latest version of Emacs
 More Manuals / Ordering Manuals       Buying printed manuals from the FSF\n")
-  (:face variable-pitch
-           "You can do basic editing with the menu bar and scroll bar \
-using the mouse.\n\n"
-           :face (variable-pitch :weight bold)
-           "Useful File menu items:\n"
-           :face variable-pitch "\
+  (:face (variable-pitch :weight bold)
+         "Useful File menu items:\n"
+         :face variable-pitch "\
 Exit Emacs\t(Or type Control-x followed by Control-c)
 Recover Crashed Session\tRecover files you were editing before a crash
 
 
 
 
+
 "
            ))
   "A list of texts to show in the middle part of splash screens.
@@ -1265,6 +1260,10 @@ where FACE is a valid face specification, as it can be used with
        "GNU Emacs is one component of the GNU/Linux operating system."
      "GNU Emacs is one component of the GNU operating system."))
   (insert "\n")
+  (fancy-splash-insert
+   :face 'variable-pitch
+   "You can do basic editing with the menu bar and scroll bar \
+using the mouse.\n\n")
   (if fancy-splash-outer-buffer
       (fancy-splash-insert
        :face 'variable-pitch
@@ -1400,7 +1399,11 @@ Warning Warning!!!  Pure space overflow    !!!Warning Warning
     (let (fancy-splash-outer-buffer)
       (fancy-splash-head)
       (dolist (text fancy-splash-text)
-        (apply #'fancy-splash-insert text))
+        (apply #'fancy-splash-insert text)
+        (insert "\n"))
+      (skip-chars-backward "\n")
+      (delete-region (point) (point-max))
+      (insert "\n")
       (fancy-splash-tail)
       (set-buffer-modified-p nil)
       (setq buffer-read-only t)