comparison lisp/startup.el @ 73703:b99c559d6365

(init-file-had-error): Add doc string. (fancy-splash-text, fancy-splash-head, fancy-splash-tail): Use fixed-width font for keyboard key descriptions.
author Richard M. Stallman <rms@gnu.org>
date Sun, 05 Nov 2006 15:19:55 +0000
parents 5cb689e83be2
children efdfdf0db9c0
comparison
equal deleted inserted replaced
73702:2bd04d2f629a 73703:b99c559d6365
281 281
282 (defvar emacs-basic-display nil) 282 (defvar emacs-basic-display nil)
283 283
284 (defvar init-file-debug nil) 284 (defvar init-file-debug nil)
285 285
286 (defvar init-file-had-error nil) 286 (defvar init-file-had-error nil
287 "Non-nil if there was an error loading the user's init file.")
287 288
288 (defvar normal-top-level-add-subdirs-inode-list nil) 289 (defvar normal-top-level-add-subdirs-inode-list nil)
289 290
290 (defvar no-blinking-cursor nil) 291 (defvar no-blinking-cursor nil)
291 292
1147 Copying Conditions\tConditions for redistributing and changing Emacs 1148 Copying Conditions\tConditions for redistributing and changing Emacs
1148 Getting New Versions\tHow to obtain the latest version of Emacs 1149 Getting New Versions\tHow to obtain the latest version of Emacs
1149 More Manuals / Ordering Manuals Buying printed manuals from the FSF\n") 1150 More Manuals / Ordering Manuals Buying printed manuals from the FSF\n")
1150 (:face (variable-pitch :weight bold) 1151 (:face (variable-pitch :weight bold)
1151 "Useful File menu items:\n" 1152 "Useful File menu items:\n"
1152 :face variable-pitch "\ 1153 :face variable-pitch
1153 Exit Emacs\t\t(Or type Control-x followed by Control-c) 1154 "Exit Emacs\t\t(Or type "
1155 :face default
1156 "Control-x"
1157 :face variable-pitch
1158 " followed by "
1159 :face default
1160 "Control-c"
1161 :face variable-pitch
1162 ")
1154 Recover Crashed Session\tRecover files you were editing before a crash 1163 Recover Crashed Session\tRecover files you were editing before a crash
1155 1164
1156 1165
1157 1166
1158 1167
1263 (insert "\n") 1272 (insert "\n")
1264 (fancy-splash-insert 1273 (fancy-splash-insert
1265 :face 'variable-pitch 1274 :face 'variable-pitch
1266 "You can do basic editing with the menu bar and scroll bar \ 1275 "You can do basic editing with the menu bar and scroll bar \
1267 using the mouse.\n\n") 1276 using the mouse.\n\n")
1268 (if fancy-splash-outer-buffer 1277 (when fancy-splash-outer-buffer
1269 (fancy-splash-insert 1278 (fancy-splash-insert
1270 :face 'variable-pitch 1279 :face 'variable-pitch
1271 (substitute-command-keys 1280 "Type "
1272 (concat 1281 :face 'default
1273 "Type \\[recenter] to begin editing" 1282 (substitute-command-keys
1274 (if (equal (buffer-name fancy-splash-outer-buffer) 1283 "\\[recenter]")
1275 "*scratch*") 1284 :face 'variable-pitch
1276 ".\n" 1285 " to begin editing"
1277 " your file.\n")))))) 1286 (if (equal (buffer-name fancy-splash-outer-buffer)
1287 "*scratch*")
1288 ".\n"
1289 " your file.\n"))))
1278 1290
1279 (defun fancy-splash-tail () 1291 (defun fancy-splash-tail ()
1280 "Insert the tail part of the splash screen into the current buffer." 1292 "Insert the tail part of the splash screen into the current buffer."
1281 (let ((fg (if (eq (frame-parameter nil 'background-mode) 'dark) 1293 (let ((fg (if (eq (frame-parameter nil 'background-mode) 'dark)
1282 "cyan" "darkblue"))) 1294 "cyan" "darkblue")))
1299 (regexp-quote (file-name-nondirectory 1311 (regexp-quote (file-name-nondirectory
1300 auto-save-list-file-prefix))) 1312 auto-save-list-file-prefix)))
1301 t) 1313 t)
1302 (fancy-splash-insert :face '(variable-pitch :foreground "red") 1314 (fancy-splash-insert :face '(variable-pitch :foreground "red")
1303 "\n\nIf an Emacs session crashed recently, " 1315 "\n\nIf an Emacs session crashed recently, "
1304 "type Meta-x recover-session RET\nto recover" 1316 "type "
1317 :face '(fixed-pitch :foreground "red")
1318 "Meta-x recover-session RET"
1319 :face '(variable-pitch :foreground "red")
1320 "\nto recover"
1305 " the files you were editing.")))) 1321 " the files you were editing."))))
1306 1322
1307 (defun fancy-splash-screens-1 (buffer) 1323 (defun fancy-splash-screens-1 (buffer)
1308 "Timer function displaying a splash screen." 1324 "Timer function displaying a splash screen."
1309 (when (> (float-time) fancy-splash-stop-time) 1325 (when (> (float-time) fancy-splash-stop-time)