(main): Use `emacs-copyright' in --version output.

diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index e14679ad820261eba90f9e95c2926733eba75b84..51b3cf38b912dd7000292268244b1b15717b9f5d 100644 (file)
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,8 @@
+2007-06-07  Glenn Morris  <rgm@gnu.org>
+
+       * etags.c (print_version): Add `emacs_copyright' string, for
+       easier automatic updating.
+
 2007-05-18  Francesco Potort\e,Al\e(B  <pot@gnu.org>
 
        * etags.c: Extern definitions of some more pointer functions for

diff --git a/src/emacs.c b/src/emacs.c
index 62b14a55388d3ce33416987e96c7e0b4ad8de922..e235856847f4f343bf0e4c28d33faeb9fb772fb0 100644 (file)
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -856,17 +856,23 @@ main (argc, argv
          So ignore --version otherwise.  */
       && initialized)
     {
-      Lisp_Object tem;
+      Lisp_Object tem, tem2;
       tem = Fsymbol_value (intern ("emacs-version"));
+      tem2 = Fsymbol_value (intern ("emacs-copyright"));
       if (!STRINGP (tem))
        {
          fprintf (stderr, "Invalid value of `emacs-version'\n");
          exit (1);
        }
+      if (!STRINGP (tem2))
+       {
+         fprintf (stderr, "Invalid value of `emacs-copyright'\n");
+         exit (1);
+       }
       else
        {
          printf ("GNU Emacs %s\n", SDATA (tem));
-         printf ("Copyright (C) 2007 Free Software Foundation, Inc.\n");
+         printf ("%s\n", SDATA(tem2));
          printf ("GNU Emacs comes with ABSOLUTELY NO WARRANTY.\n");
          printf ("You may redistribute copies of Emacs\n");
          printf ("under the terms of the GNU General Public License.\n");