Mercurial > emacs
diff lisp/startup.el @ 83554:b8d9a391daf3
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 |
line wrap: on
line diff
--- a/lisp/startup.el Sat Jan 13 22:59:28 2007 +0000 +++ b/lisp/startup.el Mon Jan 29 22:21:19 2007 +0000 @@ -1,7 +1,7 @@ ;;; startup.el --- process Emacs shell arguments ;; Copyright (C) 1985, 1986, 1992, 1994, 1995, 1996, 1997, 1998, 1999, 2000, -;; 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +;; 2001, 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc. ;; Maintainer: FSF ;; Keywords: internal @@ -1133,6 +1133,11 @@ 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 :weight bold) + "To quit a partially entered command, type " + :face default + "Control-g" + :face variable-pitch + "." "Useful File menu items:\n" :face variable-pitch "Exit Emacs\t\t(Or type " @@ -1282,7 +1287,7 @@ (emacs-version) "\n" :face '(variable-pitch :height 0.5) - "Copyright (C) 2006 Free Software Foundation, Inc.") + "Copyright (C) 2007 Free Software Foundation, Inc.") (and auto-save-list-file-prefix ;; Don't signal an error if the ;; directory for auto-save-list files @@ -1533,6 +1538,7 @@ (progn (insert "\ You can do basic editing with the menu bar and scroll bar using the mouse. +To quit a partially entered command, type Control-g. Useful File menu items: Exit Emacs (or type Control-x followed by Control-c) @@ -1549,7 +1555,7 @@ ") (insert "\n\n" (emacs-version) " -Copyright (C) 2006 Free Software Foundation, Inc.")) +Copyright (C) 2007 Free Software Foundation, Inc.")) ;; No mouse menus, so give help using kbd commands. @@ -1597,7 +1603,7 @@ (insert "\n\n" (emacs-version) " -Copyright (C) 2006 Free Software Foundation, Inc.") +Copyright (C) 2007 Free Software Foundation, Inc.") (if (and (eq (key-binding "\C-h\C-c") 'describe-copying) (eq (key-binding "\C-h\C-d") 'describe-distribution)