comparison 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
comparison
equal deleted inserted replaced
90842:e8254e8eb079 90843:d7172f202ab8
1148 "" 1148 ""
1149 (concat " (" title ")")) 1149 (concat " (" title ")"))
1150 "\n"))) 1150 "\n")))
1151 :face variable-pitch "\ 1151 :face variable-pitch "\
1152 Emacs FAQ\t\tFrequently asked questions and answers 1152 Emacs FAQ\t\tFrequently asked questions and answers
1153 View Emacs Manual\tView the Emacs manual using Info 1153 View Emacs Manual\t\tView the Emacs manual using Info
1154 Absence of Warranty\tGNU Emacs comes with " 1154 Absence of Warranty\tGNU Emacs comes with "
1155 :face (variable-pitch :slant oblique) 1155 :face (variable-pitch :slant oblique)
1156 "ABSOLUTELY NO WARRANTY\n" 1156 "ABSOLUTELY NO WARRANTY\n"
1157 :face variable-pitch 1157 :face variable-pitch
1158 "\ 1158 "\
1159 Copying Conditions\tConditions for redistributing and changing Emacs 1159 Copying Conditions\t\tConditions for redistributing and changing Emacs
1160 Getting New Versions\tHow to obtain the latest version of Emacs 1160 Getting New Versions\tHow to obtain the latest version of Emacs
1161 More Manuals / Ordering Manuals Buying printed manuals from the FSF\n") 1161 More Manuals / Ordering Manuals Buying printed manuals from the FSF\n")
1162 (:face variable-pitch 1162 (:face variable-pitch
1163 "To quit a partially entered command, type " 1163 "\nTo quit a partially entered command, type "
1164 :face default 1164 :face default
1165 "Control-g" 1165 "Control-g"
1166 :face variable-pitch 1166 :face variable-pitch
1167 ".\n" 1167 ".
1168
1169 Emacs Guided Tour\t\tSee http://www.gnu.org/software/emacs/tour/
1170
1171 "
1168 :face (variable-pitch :weight bold) 1172 :face (variable-pitch :weight bold)
1169 "Useful File menu items:\n" 1173 "Useful File menu items:\n"
1170 :face variable-pitch 1174 :face variable-pitch
1171 "Exit Emacs\t\t(Or type " 1175 "Exit Emacs\t\t(Or type "
1172 :face default 1176 :face default
1175 " followed by " 1179 " followed by "
1176 :face default 1180 :face default
1177 "Control-c" 1181 "Control-c"
1178 :face variable-pitch 1182 :face variable-pitch
1179 ") 1183 ")
1180 Recover Crashed Session\tRecover files you were editing before a crash 1184 Recover Crashed Session\tRecover files you were editing before a crash\n"
1181
1182
1183
1184
1185
1186 "
1187 )) 1185 ))
1188 "A list of texts to show in the middle part of splash screens. 1186 "A list of texts to show in the middle part of splash screens.
1189 Each element in the list should be a list of strings or pairs 1187 Each element in the list should be a list of strings or pairs
1190 `:face FACE', like `fancy-splash-insert' accepts them.") 1188 `:face FACE', like `fancy-splash-insert' accepts them.")
1191 1189