[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/startup.el,v
From: |
Richard M. Stallman |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/startup.el,v |
Date: |
Sun, 05 Nov 2006 15:19:55 +0000 |
CVSROOT: /cvsroot/emacs
Module name: emacs
Changes by: Richard M. Stallman <rms> 06/11/05 15:19:55
Index: startup.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/startup.el,v
retrieving revision 1.419
retrieving revision 1.420
diff -u -b -r1.419 -r1.420
--- startup.el 26 Sep 2006 00:51:35 -0000 1.419
+++ startup.el 5 Nov 2006 15:19:55 -0000 1.420
@@ -283,7 +283,8 @@
(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 @@
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 @@
: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
+ (when fancy-splash-outer-buffer
(fancy-splash-insert
:face 'variable-pitch
+ "Type "
+ :face 'default
(substitute-command-keys
- (concat
- "Type \\[recenter] to begin editing"
+ "\\[recenter]")
+ :face 'variable-pitch
+ " to begin editing"
(if (equal (buffer-name fancy-splash-outer-buffer)
"*scratch*")
".\n"
- " your file.\n"))))))
+ " your file.\n"))))
(defun fancy-splash-tail ()
"Insert the tail part of the splash screen into the current buffer."
@@ -1301,7 +1313,11 @@
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)
- [Emacs-diffs] Changes to emacs/lisp/startup.el,v,
Richard M. Stallman <=