aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRomain Francoise2006-01-03 08:40:49 +0000
committerRomain Francoise2006-01-03 08:40:49 +0000
commit1ca41b97bbb9b08026b71b1529a29e25b55ef16b (patch)
tree46a15ac48d2bd97521e91b0a37b7e50f589447a0
parentdcc9b98d2836bc48da00cc4169567cd66d6d8347 (diff)
downloademacs-1ca41b97bbb9b08026b71b1529a29e25b55ef16b.tar.gz
emacs-1ca41b97bbb9b08026b71b1529a29e25b55ef16b.zip
(fancy-splash-tail, normal-splash-screen): Update copyright year.
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/startup.el8
2 files changed, 9 insertions, 4 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 761f2212444..9e13b77a9c5 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12006-01-03 Romain Francoise <romain@orebokech.com>
2
3 * startup.el (fancy-splash-tail, normal-splash-screen):
4 Update copyright year.
5
12006-01-02 Chong Yidong <cyd@stupidchicken.com> 62006-01-02 Chong Yidong <cyd@stupidchicken.com>
2 7
3 * cus-edit.el (custom-guess-name-alist, custom-guess-doc-alist): 8 * cus-edit.el (custom-guess-name-alist, custom-guess-doc-alist):
diff --git a/lisp/startup.el b/lisp/startup.el
index 64da0315af4..5c98cd1eea8 100644
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -1,7 +1,7 @@
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
@@ -1266,7 +1266,7 @@ where FACE is a valid face specification, as it can be used with
1266 (emacs-version) 1266 (emacs-version)
1267 "\n" 1267 "\n"
1268 :face '(variable-pitch :height 0.5) 1268 :face '(variable-pitch :height 0.5)
1269 "Copyright (C) 2005 Free Software Foundation, Inc.") 1269 "Copyright (C) 2006 Free Software Foundation, Inc.")
1270 (and auto-save-list-file-prefix 1270 (and auto-save-list-file-prefix
1271 ;; Don't signal an error if the 1271 ;; Don't signal an error if the
1272 ;; directory for auto-save-list files 1272 ;; directory for auto-save-list files
@@ -1438,7 +1438,7 @@ More Manuals / Ordering Manuals How to order printed manuals from the FSF
1438") 1438")
1439 (insert "\n\n" (emacs-version) 1439 (insert "\n\n" (emacs-version)
1440 " 1440 "
1441Copyright (C) 2005 Free Software Foundation, Inc.")) 1441Copyright (C) 2006 Free Software Foundation, Inc."))
1442 1442
1443 ;; No mouse menus, so give help using kbd commands. 1443 ;; No mouse menus, so give help using kbd commands.
1444 1444
@@ -1486,7 +1486,7 @@ If you have no Meta key, you may instead type ESC followed by the character.)")
1486 1486
1487 (insert "\n\n" (emacs-version) 1487 (insert "\n\n" (emacs-version)
1488 " 1488 "
1489Copyright (C) 2005 Free Software Foundation, Inc.") 1489Copyright (C) 2006 Free Software Foundation, Inc.")
1490 1490
1491 (if (and (eq (key-binding "\C-h\C-c") 'describe-copying) 1491 (if (and (eq (key-binding "\C-h\C-c") 'describe-copying)
1492 (eq (key-binding "\C-h\C-d") 'describe-distribution) 1492 (eq (key-binding "\C-h\C-d") 'describe-distribution)