Merge from emacs--devo--0

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-312

1 files changed, 16 insertions, 8 deletions

diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index 36929ebc24a..8cdce18bd87 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,11 @@
+2008-01-04  Glenn Morris  <rgm@gnu.org>
+
+        * ebrowse.c (version) <emacs_copyright>: New variable.
+        Just use current year for copyright.
+
+        * etags.c (print_version):
+        * rcs2log (Copyright): Update to 2008.
+
 2007-11-28  Jason Rumney  <jasonr@gnu.org>
 
         * makefile.w32-in (VMS_SUPPORT): No longer byte-compiled.
@@ -972,7 +980,7 @@
 
 2003-09-10  Richard M. Stallman  <rms@gnu.org>
 
-        * emacsclient.c (main): Use socket_name.
+        * emacsclient.c (main): Use socket_name.
 
 2003-09-10  Andreas B,A|(Bsching  <crunchy@tzi.de>  (tiny change)
 
@@ -1540,7 +1548,7 @@
         (main): Use username field.
         (read_score): Read it.
         (push_score): Handle it.
-        (write_scores) Write it.
+        (write_scores): Write it.
         (read_score): Handle arbitrary length data.
 
 2002-03-30  Eli Zaretskii  <eliz@is.elta.co.il>
@@ -1840,9 +1848,9 @@
 
 2001-10-10  Jason Rumney  <jasonr@gnu.org>
 
-        * makefile.w32-in (ALL) Do not include fakemail.
+        * makefile.w32-in (ALL): Do not include fakemail.
 
-        * makefile.nt (install) Ditto.
+        * makefile.nt (install): Ditto.
 
 2001-10-09  Gerd Moellmann  <gerd@gnu.org>
 
@@ -2069,7 +2077,7 @@
         (consider_token): Automatic set C++ mode.
         (C_entries): New security check for yacc.
         (print_language_names, print_help): Mention the autodetect
-        feature, do not show help for the -C option, now mostly useless.
+        feature, do not show help for the -C option, now mostly useless.
         (C_entries): Tag C++ forward declarations if --declarations.
         (C_entries): Don't be fooled by things like XDEFUN.
         (consider_token): Discard asm pseudo function.
@@ -4096,7 +4104,7 @@
         * rcs2log: Add -u "login<tab>fullname<tab>mailaddr" option, which
         replaces the (now obsolescent) -n login fullname mailaddr option.
         Add -R option for recursive rlog.
-        (AWK): New environment variable (default `awk') for awk program name.
+        (AWK): New environment variable (default `awk') for awk program name.
         (output_authors, tab, loginFullnameMailaddrs, recursive): New vars.
         Quote authors and fullnames correctly.
         Don't omit path from repository root when logging CVS files.
@@ -6350,7 +6358,7 @@
 1988-06-23  Richard Stallman  (rms@sugar-bombs.ai.mit.edu)
 
         * etags.c: Handle `typedef struct foo {' (price@mcc.com).
-        (istoken) New string-comparison macro.
+        (istoken): New string-comparison macro.
         (consider_token): New arg `level'.  New state `tag_ok' in `tydef'.
 
 1988-06-14  Richard Stallman  (rms@sugar-bombs.ai.mit.edu)
@@ -6422,7 +6430,7 @@
 
     Copyright (C) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995,
         1996, 1997, 1998, 1999, 2001, 2002, 2003, 2004, 2005,
-        2006, 2007 Free Software Foundation, Inc.
+        2006, 2007, 2008 Free Software Foundation, Inc.
 
   This file is part of GNU Emacs.