aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorRomain Francoise2005-10-19 16:53:31 +0000
committerRomain Francoise2005-10-19 16:53:31 +0000
commitd7b94c98ba0ef2f2d19715d87402ae9e1e74f347 (patch)
tree0a84744c5980665c560ff2d8a71a36144f2b72ca /src
parent4754e179272a6f8b16bacb70726559a07ab77f41 (diff)
downloademacs-d7b94c98ba0ef2f2d19715d87402ae9e1e74f347.tar.gz
emacs-d7b94c98ba0ef2f2d19715d87402ae9e1e74f347.zip
(main): Update copyright year.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog6
-rw-r--r--src/emacs.c2
2 files changed, 5 insertions, 3 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 852a7b9745e..4bfa70cf3f1 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
12005-10-19 Romain Francoise <romain@orebokech.com>
2
3 * emacs.c (main): Update copyright year.
4
12005-10-18 Chong Yidong <cyd@stupidchicken.com> 52005-10-18 Chong Yidong <cyd@stupidchicken.com>
2 6
3 * image.c (Vmax_image_size): New variable. 7 * image.c (Vmax_image_size): New variable.
@@ -7170,8 +7174,6 @@
7170 7174
7171 * casefiddle.c (casify_object): Return OBJ unchanged if not real char. 7175 * casefiddle.c (casify_object): Return OBJ unchanged if not real char.
7172 7176
7173 * emacs.c (main): Update copyright year.
7174
7175 * fileio.c (Fread_file_name): Expand DIR if not absolute. 7177 * fileio.c (Fread_file_name): Expand DIR if not absolute.
7176 7178
7177 * insdel.c (del_range_2, replace_range): Don't write an anchor 7179 * insdel.c (del_range_2, replace_range): Don't write an anchor
diff --git a/src/emacs.c b/src/emacs.c
index 4eee9e0e534..d3e16c046db 100644
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -896,7 +896,7 @@ main (argc, argv
896 else 896 else
897 { 897 {
898 printf ("GNU Emacs %s\n", SDATA (tem)); 898 printf ("GNU Emacs %s\n", SDATA (tem));
899 printf ("Copyright (C) 2004 Free Software Foundation, Inc.\n"); 899 printf ("Copyright (C) 2005 Free Software Foundation, Inc.\n");
900 printf ("GNU Emacs comes with ABSOLUTELY NO WARRANTY.\n"); 900 printf ("GNU Emacs comes with ABSOLUTELY NO WARRANTY.\n");
901 printf ("You may redistribute copies of Emacs\n"); 901 printf ("You may redistribute copies of Emacs\n");
902 printf ("under the terms of the GNU General Public License.\n"); 902 printf ("under the terms of the GNU General Public License.\n");