Mercurial > emacs

comparison lisp/startup.el @ 83554:b8d9a391daf3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merged from emacs@sv.gnu.org Patches applied: * emacs@sv.gnu.org/emacs--devo--0--patch-599 Merge from erc--main--0 * emacs@sv.gnu.org/emacs--devo--0--patch-600 Merge from erc--main--0 * emacs@sv.gnu.org/emacs--devo--0--patch-601 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-602 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-603 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-604 Merge from gnus--rel--5.10 * emacs@sv.gnu.org/emacs--devo--0--patch-605 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-606 Merge from gnus--rel--5.10 * emacs@sv.gnu.org/emacs--devo--0--patch-607 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-608 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-609 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-610 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-611 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-612 Merge from gnus--rel--5.10 * emacs@sv.gnu.org/emacs--devo--0--patch-613 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-614 Make byte compiler correctly write circular constants * emacs@sv.gnu.org/emacs--devo--0--patch-615 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-616 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-617 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-618 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-192 Merge from emacs--devo--0 * emacs@sv.gnu.org/gnus--rel--5.10--patch-193 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-194 Merge from emacs--devo--0 * emacs@sv.gnu.org/gnus--rel--5.10--patch-195 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-196 Update from CVS git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-594
author Karoly Lorentey <lorentey@elte.hu>
date Mon, 29 Jan 2007 22:21:19 +0000
parents 17e0dd217877 b391b0c782f4
children 07774e5c3ff5
comparison
equal deleted inserted replaced
83553:32073cbc5eb6 83554:b8d9a391daf3
1 ;;; startup.el --- process Emacs shell arguments 1 ;;; startup.el --- process Emacs shell arguments
2 2
3 ;; Copyright (C) 1985, 1986, 1992, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 3 ;; Copyright (C) 1985, 1986, 1992, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
4 ;; 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. 4 ;; 2001, 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
5 5
6 ;; Maintainer: FSF 6 ;; Maintainer: FSF
7 ;; Keywords: internal 7 ;; Keywords: internal
8 8
9 ;; This file is part of GNU Emacs. 9 ;; This file is part of GNU Emacs.
1131 "\ 1131 "\
1132 Copying Conditions\tConditions for redistributing and changing Emacs 1132 Copying Conditions\tConditions for redistributing and changing Emacs
1133 Getting New Versions\tHow to obtain the latest version of Emacs 1133 Getting New Versions\tHow to obtain the latest version of Emacs
1134 More Manuals / Ordering Manuals Buying printed manuals from the FSF\n") 1134 More Manuals / Ordering Manuals Buying printed manuals from the FSF\n")
1135 (:face (variable-pitch :weight bold) 1135 (:face (variable-pitch :weight bold)
1136 "To quit a partially entered command, type "
1137 :face default
1138 "Control-g"
1139 :face variable-pitch
1140 "."
1136 "Useful File menu items:\n" 1141 "Useful File menu items:\n"
1137 :face variable-pitch 1142 :face variable-pitch
1138 "Exit Emacs\t\t(Or type " 1143 "Exit Emacs\t\t(Or type "
1139 :face default 1144 :face default
1140 "Control-x" 1145 "Control-x"
1280 (fancy-splash-insert :face `(variable-pitch :foreground ,fg) 1285 (fancy-splash-insert :face `(variable-pitch :foreground ,fg)
1281 "\nThis is " 1286 "\nThis is "
1282 (emacs-version) 1287 (emacs-version)
1283 "\n" 1288 "\n"
1284 :face '(variable-pitch :height 0.5) 1289 :face '(variable-pitch :height 0.5)
1285 "Copyright (C) 2006 Free Software Foundation, Inc.") 1290 "Copyright (C) 2007 Free Software Foundation, Inc.")
1286 (and auto-save-list-file-prefix 1291 (and auto-save-list-file-prefix
1287 ;; Don't signal an error if the 1292 ;; Don't signal an error if the
1288 ;; directory for auto-save-list files 1293 ;; directory for auto-save-list files
1289 ;; does not yet exist. 1294 ;; does not yet exist.
1290 (file-directory-p (file-name-directory 1295 (file-directory-p (file-name-directory
1531 ;; The user can use the mouse to activate menus 1536 ;; The user can use the mouse to activate menus
1532 ;; so give help in terms of menu items. 1537 ;; so give help in terms of menu items.
1533 (progn 1538 (progn
1534 (insert "\ 1539 (insert "\
1535 You can do basic editing with the menu bar and scroll bar using the mouse. 1540 You can do basic editing with the menu bar and scroll bar using the mouse.
1541 To quit a partially entered command, type Control-g.
1536 1542
1537 Useful File menu items: 1543 Useful File menu items:
1538 Exit Emacs (or type Control-x followed by Control-c) 1544 Exit Emacs (or type Control-x followed by Control-c)
1539 Recover Crashed Session Recover files you were editing before a crash 1545 Recover Crashed Session Recover files you were editing before a crash
1540 1546
1547 Getting New Versions How to obtain the latest version of Emacs 1553 Getting New Versions How to obtain the latest version of Emacs
1548 More Manuals / Ordering Manuals How to order printed manuals from the FSF 1554 More Manuals / Ordering Manuals How to order printed manuals from the FSF
1549 ") 1555 ")
1550 (insert "\n\n" (emacs-version) 1556 (insert "\n\n" (emacs-version)
1551 " 1557 "
1552 Copyright (C) 2006 Free Software Foundation, Inc.")) 1558 Copyright (C) 2007 Free Software Foundation, Inc."))
1553 1559
1554 ;; No mouse menus, so give help using kbd commands. 1560 ;; No mouse menus, so give help using kbd commands.
1555 1561
1556 ;; If keys have their default meanings, 1562 ;; If keys have their default meanings,
1557 ;; use precomputed string to save lots of time. 1563 ;; use precomputed string to save lots of time.
1595 \(`C-' means use the CTRL key. `M-' means use the Meta (or Alt) key. 1601 \(`C-' means use the CTRL key. `M-' means use the Meta (or Alt) key.
1596 If you have no Meta key, you may instead type ESC followed by the character.)") 1602 If you have no Meta key, you may instead type ESC followed by the character.)")
1597 1603
1598 (insert "\n\n" (emacs-version) 1604 (insert "\n\n" (emacs-version)
1599 " 1605 "
1600 Copyright (C) 2006 Free Software Foundation, Inc.") 1606 Copyright (C) 2007 Free Software Foundation, Inc.")
1601 1607
1602 (if (and (eq (key-binding "\C-h\C-c") 'describe-copying) 1608 (if (and (eq (key-binding "\C-h\C-c") 'describe-copying)
1603 (eq (key-binding "\C-h\C-d") 'describe-distribution) 1609 (eq (key-binding "\C-h\C-d") 'describe-distribution)
1604 (eq (key-binding "\C-h\C-w") 'describe-no-warranty)) 1610 (eq (key-binding "\C-h\C-w") 'describe-no-warranty))
1605 (insert 1611 (insert