Mercurial > emacs
comparison lisp/startup.el @ 83453:55e22205ba88
Merged from miles@gnu.org--gnu-2005 (patch 683-684)
Patches applied:
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-683
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-684
Update from CVS
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-493
author | Karoly Lorentey <lorentey@elte.hu> |
---|---|
date | Fri, 06 Jan 2006 16:13:05 +0000 |
parents | 00c55c52afd8 8c81fd7e6877 |
children | 8438f5473d99 |
comparison
equal
deleted
inserted
replaced
83452:02980fcccc43 | 83453:55e22205ba88 |
---|---|
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 Free Software Foundation, Inc. | 4 ;; 2001, 2002, 2003, 2004, 2005, 2006 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. |
1248 (fancy-splash-insert :face `(variable-pitch :foreground ,fg) | 1248 (fancy-splash-insert :face `(variable-pitch :foreground ,fg) |
1249 "\nThis is " | 1249 "\nThis is " |
1250 (emacs-version) | 1250 (emacs-version) |
1251 "\n" | 1251 "\n" |
1252 :face '(variable-pitch :height 0.5) | 1252 :face '(variable-pitch :height 0.5) |
1253 "Copyright (C) 2005 Free Software Foundation, Inc.") | 1253 "Copyright (C) 2006 Free Software Foundation, Inc.") |
1254 (and auto-save-list-file-prefix | 1254 (and auto-save-list-file-prefix |
1255 ;; Don't signal an error if the | 1255 ;; Don't signal an error if the |
1256 ;; directory for auto-save-list files | 1256 ;; directory for auto-save-list files |
1257 ;; does not yet exist. | 1257 ;; does not yet exist. |
1258 (file-directory-p (file-name-directory | 1258 (file-directory-p (file-name-directory |
1437 Getting New Versions How to obtain the latest version of Emacs | 1437 Getting New Versions How to obtain the latest version of Emacs |
1438 More Manuals / Ordering Manuals How to order printed manuals from the FSF | 1438 More Manuals / Ordering Manuals How to order printed manuals from the FSF |
1439 ") | 1439 ") |
1440 (insert "\n\n" (emacs-version) | 1440 (insert "\n\n" (emacs-version) |
1441 " | 1441 " |
1442 Copyright (C) 2005 Free Software Foundation, Inc.")) | 1442 Copyright (C) 2006 Free Software Foundation, Inc.")) |
1443 | 1443 |
1444 ;; No mouse menus, so give help using kbd commands. | 1444 ;; No mouse menus, so give help using kbd commands. |
1445 | 1445 |
1446 ;; If keys have their default meanings, | 1446 ;; If keys have their default meanings, |
1447 ;; use precomputed string to save lots of time. | 1447 ;; use precomputed string to save lots of time. |
1485 \(`C-' means use the CTRL key. `M-' means use the Meta (or Alt) key. | 1485 \(`C-' means use the CTRL key. `M-' means use the Meta (or Alt) key. |
1486 If you have no Meta key, you may instead type ESC followed by the character.)") | 1486 If you have no Meta key, you may instead type ESC followed by the character.)") |
1487 | 1487 |
1488 (insert "\n\n" (emacs-version) | 1488 (insert "\n\n" (emacs-version) |
1489 " | 1489 " |
1490 Copyright (C) 2005 Free Software Foundation, Inc.") | 1490 Copyright (C) 2006 Free Software Foundation, Inc.") |
1491 | 1491 |
1492 (if (and (eq (key-binding "\C-h\C-c") 'describe-copying) | 1492 (if (and (eq (key-binding "\C-h\C-c") 'describe-copying) |
1493 (eq (key-binding "\C-h\C-d") 'describe-distribution) | 1493 (eq (key-binding "\C-h\C-d") 'describe-distribution) |
1494 (eq (key-binding "\C-h\C-w") 'describe-no-warranty)) | 1494 (eq (key-binding "\C-h\C-w") 'describe-no-warranty)) |
1495 (insert | 1495 (insert |