Merged in changes from CVS trunk

Patches applied:

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

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

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

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-203
   Add entry for macroexpand-all to NEWS

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

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-205
   Add macroexpand-all to lisp reference manual

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

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

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

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

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-210
   More RCS keyword removal

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-211
   File-permission tweaks

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-212
   Checkout from CVS with unexpanded RCS keywords


git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-136

3 files changed, 3 insertions, 5 deletions

diff --git a/lib-src/b2m.pl b/lib-src/b2m.pl
index ce547e0dd81..f76bee300a8 100644
--- a/lib-src/b2m.pl
+++ b/lib-src/b2m.pl
@@ -30,7 +30,7 @@ use Mail::Address;
 use Date::Parse;
 
 my($whoami) = basename $0;
-my($version) = '$Revision: 1.6 $';
+my($version) = '$Revision$';
 my($usage) = "Usage: $whoami [--help] [--version] [--[no]full-headers] [Babyl-file]
 \tBy default, full headers are printed.\n";
 
diff --git a/lib-src/rcs2log b/lib-src/rcs2log
index 658a30c789b..572af065918 100755
--- a/lib-src/rcs2log
+++ b/lib-src/rcs2log
@@ -29,7 +29,7 @@ Options:
 
 Report bugs to <bug-gnu-emacs@gnu.org>.'
 
-Id='$Id: rcs2log,v 1.53 2004/02/15 07:41:58 uid65632 Exp $'
+Id='$Id$'
 
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 2001, 2002, 2003,
 # 2004 Free Software Foundation, Inc.
diff --git a/lib-src/vcdiff b/lib-src/vcdiff
index 9e52a7f4c30..9c513ac8200 100755
--- a/lib-src/vcdiff
+++ b/lib-src/vcdiff
@@ -3,7 +3,7 @@
 # Enhanced sccs diff utility for use with vc mode.
 # This version is more compatible with rcsdiff(1).
 #
-# Copyright (C) 1992, 1993, 1995, 1997, 2001
+# Copyright (C) 1992, 1993, 1995, 1997, 2001, 2004
 #   Free Software Foundation, Inc.
 #
 # This file is part of GNU Emacs.
@@ -23,8 +23,6 @@
 # Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 # Boston, MA 02111-1307, USA.
 #
-#       $Id: vcdiff,v 1.8 2003/09/01 15:45:03 miles Exp $
-#
 
 DIFF="diff"
 usage="$0: Usage: vcdiff [--brief] [-q] [-r<sid1>] [-r<sid2>] [diffopts] sccsfile..."