(init-file-had-error): Add doc string.

(fancy-splash-text, fancy-splash-head, fancy-splash-tail):
Use fixed-width font for keyboard key descriptions.

diff --git a/lisp/startup.el b/lisp/startup.el
index 664fd285754addaa0892b70db69aae0ca139c49d..91491ac25e266e5d9d3ff779dccae14fbfe41b1a 100644 (file)
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -283,7 +283,8 @@ from being initialized."
 
 (defvar init-file-debug nil)
 
-(defvar init-file-had-error nil)
+(defvar init-file-had-error nil
+  "Non-nil if there was an error loading the user's init file.")
 
 (defvar normal-top-level-add-subdirs-inode-list nil)
 
@@ -1149,8 +1150,16 @@ 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 :weight bold)
         "Useful File menu items:\n"
-        :face variable-pitch "\
-Exit Emacs\t\t(Or type Control-x followed by Control-c)
+        :face variable-pitch
+        "Exit Emacs\t\t(Or type "
+        :face default
+        "Control-x"
+        :face variable-pitch
+        " followed by "
+        :face default
+        "Control-c"
+        :face variable-pitch
+        ")
 Recover Crashed Session\tRecover files you were editing before a crash
 
 
@@ -1265,16 +1274,19 @@ where FACE is a valid face specification, as it can be used with
    :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
-       (substitute-command-keys
-       (concat
-        "Type \\[recenter] to begin editing"
-        (if (equal (buffer-name fancy-splash-outer-buffer)
-                   "*scratch*")
-            ".\n"
-          " your file.\n"))))))
+  (when fancy-splash-outer-buffer
+    (fancy-splash-insert
+     :face 'variable-pitch
+     "Type "
+     :face 'default
+     (substitute-command-keys
+      "\\[recenter]")
+     :face 'variable-pitch
+     " to begin editing"
+     (if (equal (buffer-name fancy-splash-outer-buffer)
+               "*scratch*")
+        ".\n"
+       " your file.\n"))))
 
 (defun fancy-splash-tail ()
   "Insert the tail part of the splash screen into the current buffer."
@@ -1301,7 +1313,11 @@ using the mouse.\n\n")
          t)
         (fancy-splash-insert :face '(variable-pitch :foreground "red")
                              "\n\nIf an Emacs session crashed recently, "
-                             "type Meta-x recover-session RET\nto recover"
+                             "type "
+                             :face '(fixed-pitch :foreground "red")
+                             "Meta-x recover-session RET"
+                             :face '(variable-pitch :foreground "red")
+                             "\nto recover"
                              " the files you were editing."))))
 
 (defun fancy-splash-screens-1 (buffer)