Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-62

Merge from emacs--cvs-trunk--0

Patches applied:

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-616
 - miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-620
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-621
   Merge from gnus--rel--5.10

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-622
 - miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-625
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-626
   Merge from gnus--rel--5.10

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-627
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-628
   Merge from gnus--rel--5.10

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-629
 - miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-630
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-631
   Merge from gnus--rel--5.10

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-632
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-633
   Merge from gnus--rel--5.10

 * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-51
 - miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-52
   Update from CVS

 * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-53
   Merge from emacs--cvs-trunk--0

 * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-54
 - miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-55
   Update from CVS

 * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-56
   Update from CVS: Add lisp/legacy-gnus-agent.el

 * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-57
 - miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-58
   Update from CVS

1 files changed, 3 insertions, 3 deletions

diff --git a/lisp/startup.el b/lisp/startup.el
index 5e9247d483b..b08617a9fef 100644
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -1156,7 +1156,7 @@ where FACE is a valid face specification, as it can be used with
                          (emacs-version)
                          "\n"
                          :face '(variable-pitch :height 0.5)
-                         "Copyright (C) 2002 Free Software Foundation, Inc.")
+                         "Copyright (C) 2004 Free Software Foundation, Inc.")
     (and auto-save-list-file-prefix
          ;; Don't signal an error if the
          ;; directory for auto-save-list files
@@ -1322,7 +1322,7 @@ More Manuals / Ordering Manuals    How to order printed manuals from the FSF.
 ")
                   (insert "\n\n" (emacs-version)
                           "
-Copyright (C) 2002 Free Software Foundation, Inc."))
+Copyright (C) 2004 Free Software Foundation, Inc."))
 
               ;; No mouse menus, so give help using kbd commands.
 
@@ -1370,7 +1370,7 @@ If you have no Meta key, you may instead type ESC followed by the character.)")
 
               (insert "\n\n" (emacs-version)
                       "
-Copyright (C) 2002 Free Software Foundation, Inc.")
+Copyright (C) 2004 Free Software Foundation, Inc.")
 
               (if (and (eq (key-binding "\C-h\C-c") 'describe-copying)
                        (eq (key-binding "\C-h\C-d") 'describe-distribution)