Mercurial > emacs
diff lisp/startup.el @ 90843:d7172f202ab8
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 726-750)
- Update from CVS
- Merge from emacs--rel--22
- Merge from gnus--rel--5.10
* emacs--rel--22 (patch 6-17)
- Update from CVS
- Update from CVS: src/xterm.c (XTread_socket): Revert last change.
* gnus--rel--5.10 (patch 218-221)
- Merge from emacs--devo--0, emacs--rel--22
- Update from CVS
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-205
author | Miles Bader <miles@gnu.org> |
---|---|
date | Tue, 15 May 2007 07:17:13 +0000 |
parents | 4ef881a120fe a7056aafb66a |
children | e9f94688a064 |
line wrap: on
line diff
--- a/lisp/startup.el Mon May 14 11:56:47 2007 +0000 +++ b/lisp/startup.el Tue May 15 07:17:13 2007 +0000 @@ -1150,21 +1150,25 @@ "\n"))) :face variable-pitch "\ Emacs FAQ\t\tFrequently asked questions and answers -View Emacs Manual\tView the Emacs manual using Info +View Emacs Manual\t\tView the Emacs manual using Info Absence of Warranty\tGNU Emacs comes with " :face (variable-pitch :slant oblique) "ABSOLUTELY NO WARRANTY\n" :face variable-pitch "\ -Copying Conditions\tConditions for redistributing and changing Emacs +Copying Conditions\t\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 - "To quit a partially entered command, type " + "\nTo quit a partially entered command, type " :face default "Control-g" :face variable-pitch - ".\n" + ". + +Emacs Guided Tour\t\tSee http://www.gnu.org/software/emacs/tour/ + +" :face (variable-pitch :weight bold) "Useful File menu items:\n" :face variable-pitch @@ -1177,13 +1181,7 @@ "Control-c" :face variable-pitch ") -Recover Crashed Session\tRecover files you were editing before a crash - - - - - -" +Recover Crashed Session\tRecover files you were editing before a crash\n" )) "A list of texts to show in the middle part of splash screens. Each element in the list should be a list of strings or pairs