aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorRomain Francoise2006-01-03 08:40:26 +0000
committerRomain Francoise2006-01-03 08:40:26 +0000
commitdcc9b98d2836bc48da00cc4169567cd66d6d8347 (patch)
tree09996a74dc2c64c247402de54b699508e7b1c5ba /src
parent1a271e14d73298ecc665993ac7d0087ab2a66f92 (diff)
downloademacs-dcc9b98d2836bc48da00cc4169567cd66d6d8347.tar.gz
emacs-dcc9b98d2836bc48da00cc4169567cd66d6d8347.zip
(main): Update copyright year.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog4
-rw-r--r--src/emacs.c4
2 files changed, 6 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 6ee440f4cf2..0322aed8645 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
12006-01-03 Romain Francoise <romain@orebokech.com>
2
3 * emacs.c (main): Update copyright year.
4
12006-01-03 Ken Raeburn <raeburn@mit.edu> 52006-01-03 Ken Raeburn <raeburn@mit.edu>
2 6
3 * callproc.c (delete_temp_file): Bind file-name-handler-alist to 7 * callproc.c (delete_temp_file): Bind file-name-handler-alist to
diff --git a/src/emacs.c b/src/emacs.c
index 71b12d5a407..846bfc7e453 100644
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -1,6 +1,6 @@
1/* Fully extensible Emacs, running on Unix, intended for GNU. 1/* Fully extensible Emacs, running on Unix, intended for GNU.
2 Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1997, 1998, 1999, 2 Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1997, 1998, 1999,
3 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. 3 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
4 4
5This file is part of GNU Emacs. 5This file is part of GNU Emacs.
6 6
@@ -899,7 +899,7 @@ main (argc, argv
899 else 899 else
900 { 900 {
901 printf ("GNU Emacs %s\n", SDATA (tem)); 901 printf ("GNU Emacs %s\n", SDATA (tem));
902 printf ("Copyright (C) 2005 Free Software Foundation, Inc.\n"); 902 printf ("Copyright (C) 2006 Free Software Foundation, Inc.\n");
903 printf ("GNU Emacs comes with ABSOLUTELY NO WARRANTY.\n"); 903 printf ("GNU Emacs comes with ABSOLUTELY NO WARRANTY.\n");
904 printf ("You may redistribute copies of Emacs\n"); 904 printf ("You may redistribute copies of Emacs\n");
905 printf ("under the terms of the GNU General Public License.\n"); 905 printf ("under the terms of the GNU General Public License.\n");