diff --git a/texinfo/cygnus/texinfo.tex b/texinfo/cygnus/texinfo.tex
index cd4030abf325cc195508518c13c93c7c51861f6d..8546205c1f27ef5fd08a05874f80557458d0deed 100644
--- a/texinfo/cygnus/texinfo.tex
+++ b/texinfo/cygnus/texinfo.tex
@@ -1,4 +1,4 @@
-%$Id: texinfo.tex,v 1.1 1998/03/23 04:42:12 law Exp $
+%$Id: texinfo.tex,v 1.1.1.1 1998/03/23 04:42:12 law Exp $
 % Cover file to permit easy management of FSF texinfo.tex and use of
 % Cygnus local revisions.
 % First we get the official FSF one:
diff --git a/texinfo/cygnus/texiplus.tex b/texinfo/cygnus/texiplus.tex
index 195f4ddcfe869af7c58e96b46750bfad6b820069..01a4e1316a6ae0d300a873ffe929320dbbe5d9eb 100644
--- a/texinfo/cygnus/texiplus.tex
+++ b/texinfo/cygnus/texiplus.tex
@@ -2,7 +2,7 @@
 %% Cygnus revisions to texinfo.tex, TeX macros to handle texinfo files
 %   Copyright (C) 1991 Free Software Foundation, Inc.
 %% Maintained at Cygnus Support as: 
-%%$Id: texiplus.tex,v 1.1 1998/03/23 04:42:12 law Exp $
+%%$Id: texiplus.tex,v 1.1.1.1 1998/03/23 04:42:12 law Exp $
   
 %This texi+.tex file is free software; you can redistribute it and/or
 %modify it under the terms of the GNU General Public License as
diff --git a/texinfo/doc/Makefile.am b/texinfo/doc/Makefile.am
index 09469b1f6a479e75e73219065344cec3244ad4fd..72eb1b79f031cedc8fd516ef6f5976820fab58cb 100644
--- a/texinfo/doc/Makefile.am
+++ b/texinfo/doc/Makefile.am
@@ -1,5 +1,5 @@
 ## Makefile.am for texinfo/emacs.
-## $Id: Makefile.am,v 1.1 1998/03/23 04:42:12 law Exp $
+## $Id: Makefile.am,v 1.2 1998/03/24 18:05:32 law Exp $
 ## Run automake in .. to produce Makefile.in from this.
 
 info_TEXINFOS = info-stnd.texi info.texi texinfo.texi
diff --git a/texinfo/doc/info-stnd.texi b/texinfo/doc/info-stnd.texi
index d705acd6cf5d88b59d964beff6f0ff078e79831c..98df1358f986c4e32989d937c0f1fe82ab8bc568 100644
--- a/texinfo/doc/info-stnd.texi
+++ b/texinfo/doc/info-stnd.texi
@@ -9,7 +9,7 @@
 @synindex fn cp
 @synindex ky cp
 @comment %**end of header
-@comment $Id: info-stnd.texi,v 1.1 1998/03/23 04:42:12 law Exp $
+@comment $Id: info-stnd.texi,v 1.2 1998/03/24 18:05:36 law Exp $
 
 @dircategory Texinfo documentation system
 @direntry
diff --git a/texinfo/doc/info.texi b/texinfo/doc/info.texi
index 5f06282b15cf6c6c4889f8aa0bcbf391049c6c44..9e63665a1361f4fd6bac342c0b279b3c417d9926 100644
--- a/texinfo/doc/info.texi
+++ b/texinfo/doc/info.texi
@@ -3,7 +3,7 @@
 @setfilename info.info
 @settitle Info 1.0
 @comment %**end of header 
-@comment $Id: info.texi,v 1.1 1998/03/23 04:42:12 law Exp $
+@comment $Id: info.texi,v 1.2 1998/03/24 18:05:37 law Exp $
 
 @dircategory Texinfo documentation system
 @direntry
diff --git a/texinfo/doc/texinfo.tex b/texinfo/doc/texinfo.tex
index 0c69f8839c1804ec661410c06a88f5f0b3b2b662..124d337be4202e8288fe9bbd9aa2ce70ef2b924e 100644
--- a/texinfo/doc/texinfo.tex
+++ b/texinfo/doc/texinfo.tex
@@ -1,5 +1,5 @@
 %% TeX macros to handle Texinfo files.
-%% $Id: texinfo.tex,v 1.1 1998/03/23 04:42:12 law Exp $
+%% $Id: texinfo.tex,v 1.2 1998/03/24 18:05:39 law Exp $
 
 %  Copyright (C) 1985, 86, 88, 90, 91, 92, 93,
 %                94, 95, 96, 97 Free Software Foundation, Inc.
@@ -36,7 +36,7 @@
 
 % This automatically updates the version number based on RCS.
 \def\deftexinfoversion$#1: #2 ${\def\texinfoversion{#2}}
-\deftexinfoversion$Revision: 1.1 $
+\deftexinfoversion$Revision: 1.2 $
 \message{Loading texinfo package [Version \texinfoversion]:}
 
 % If in a .fmt file, print the version number
diff --git a/texinfo/doc/texinfo.texi b/texinfo/doc/texinfo.texi
index 46a87ea06ab77dbef45d4bdd5a656bc5a5fc5c37..10b236a941d87b2871f8020d64d092cc8406a6ac 100644
--- a/texinfo/doc/texinfo.texi
+++ b/texinfo/doc/texinfo.texi
@@ -1,5 +1,5 @@
 \input texinfo.tex    @c -*-texinfo-*-
-@c $Id: texinfo.texi,v 1.1 1998/03/23 04:42:12 law Exp $
+@c $Id: texinfo.texi,v 1.1.1.1 1998/03/23 04:42:12 law Exp $
 @c %**start of header
 
 @c All text is ignored before the setfilename.
diff --git a/texinfo/emacs/Makefile.am b/texinfo/emacs/Makefile.am
index 8f4b4591713adaaeadc92ebba40c5456a50f2a4b..e2e98af28d575699f792cef57ff58199491d90b0 100644
--- a/texinfo/emacs/Makefile.am
+++ b/texinfo/emacs/Makefile.am
@@ -1,5 +1,5 @@
 ## Makefile.am for texinfo/emacs.
-## $Id: Makefile.am,v 1.1 1998/03/23 04:42:12 law Exp $
+## $Id: Makefile.am,v 1.1.1.1 1998/03/23 04:42:12 law Exp $
 ## Run automake in .. to produce Makefile.in from this.
 
 # Do not byte compile our Elisp files by default.
diff --git a/texinfo/emacs/elisp-comp b/texinfo/emacs/elisp-comp
index 72b204d68b5213205a3627244f778e3d0e6fe706..eb16b5da1bf88784fcbdaafbdb17412031f5af48 100755
--- a/texinfo/emacs/elisp-comp
+++ b/texinfo/emacs/elisp-comp
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $Id: elisp-comp,v 1.1 1997/08/21 22:57:57 jason Exp $
+# $Id: elisp-comp,v 1.1.1.1 1997/08/21 22:57:57 jason Exp $
 # Trivial script to compile the Elisp files.
 setpath=${TMPDIR-/tmp}/elc.$$
 echo "(setq load-path (cons nil load-path))" > $setpath
diff --git a/texinfo/info/Makefile.am b/texinfo/info/Makefile.am
index b4c96d5d9e911fd9af53e2a2c618508adf4d96bf..15db3668cc63d1a2f4d73ce8f349ea1f8af2bd24 100644
--- a/texinfo/info/Makefile.am
+++ b/texinfo/info/Makefile.am
@@ -1,5 +1,5 @@
 ## Makefile.am for texinfo/info.
-## $Id: Makefile.am,v 1.1 1998/03/23 04:42:20 law Exp $
+## $Id: Makefile.am,v 1.2 1998/03/24 18:05:58 law Exp $
 ## Run automake in .. to produce Makefile.in from this.
 
 noinst_PROGRAMS = makedoc
diff --git a/texinfo/info/clib.c b/texinfo/info/clib.c
index 0f913370bf300e24f7d55c73d04f1e7d6b27055f..57813967ad02aa23bd7e3709c551bc30258ff929 100644
--- a/texinfo/info/clib.c
+++ b/texinfo/info/clib.c
@@ -1,5 +1,5 @@
 /* clib.c: Functions which we normally expect to find in the C library.
-   $Id: clib.c,v 1.1 1997/08/21 22:57:59 jason Exp $
+   $Id: clib.c,v 1.1.1.1 1997/08/21 22:57:59 jason Exp $
 
    This file is part of GNU Info, a program for reading online documentation
    stored in Info format.
diff --git a/texinfo/info/dir.c b/texinfo/info/dir.c
index 651e48a6e368572e0b26b0ef60b159d81c166c01..fbc093fe56379cc3c140f595133271bb3faf203e 100644
--- a/texinfo/info/dir.c
+++ b/texinfo/info/dir.c
@@ -1,5 +1,5 @@
 /* dir.c -- How to build a special "dir" node from "localdir" files.
-   $Id: dir.c,v 1.6 1997/07/27 21:09:20 karl Exp $
+   $Id: dir.c,v 1.1.1.2 1998/03/22 20:42:22 law Exp $
 
    Copyright (C) 1993, 97 Free Software Foundation, Inc.
 
diff --git a/texinfo/info/display.c b/texinfo/info/display.c
index 3f2abe34cb15890b5d7e02fb2dc3d87bbb7e86f6..edf0dbae28db36e01c937c588b894a20409d3513 100644
--- a/texinfo/info/display.c
+++ b/texinfo/info/display.c
@@ -1,5 +1,5 @@
 /* display.c -- How to display Info windows.
-   $Id: display.c,v 1.6 1997/07/24 21:13:27 karl Exp $
+   $Id: display.c,v 1.1.1.2 1998/03/22 20:42:23 law Exp $
 
    Copyright (C) 1993, 97 Free Software Foundation, Inc.
 
diff --git a/texinfo/info/display.h b/texinfo/info/display.h
index 439813576e21c29a7acb3eaba418a18d46a5d76f..b882ab5f29751283a507539afddbffe6b84869ec 100644
--- a/texinfo/info/display.h
+++ b/texinfo/info/display.h
@@ -1,5 +1,5 @@
 /* display.h -- How the display in Info is done.
-   $Id: display.h,v 1.2 1997/07/15 18:37:29 karl Exp $
+   $Id: display.h,v 1.1.1.2 1998/03/22 20:42:24 law Exp $
 
    This file is part of GNU Info, a program for reading online documentation
    stored in Info format.
diff --git a/texinfo/info/echo-area.c b/texinfo/info/echo-area.c
index 6f97a14d6937498871955133d5d00c5a90ee225c..6cc0199689f943d43185d07da221aeb70ea6f87f 100644
--- a/texinfo/info/echo-area.c
+++ b/texinfo/info/echo-area.c
@@ -1,5 +1,5 @@
 /* echo-area.c -- How to read a line in the echo area.
-   $Id: echo-area.c,v 1.1 1998/03/23 04:42:27 law Exp $
+   $Id: echo-area.c,v 1.2 1998/03/24 18:06:11 law Exp $
 
    Copyright (C) 1993, 97 Free Software Foundation, Inc.
 
diff --git a/texinfo/info/echo-area.h b/texinfo/info/echo-area.h
index b2386790c61969e08d3dce3b65ba60e0dadf12e2..9f948c1037e5820a913db42b208e8048dc868b23 100644
--- a/texinfo/info/echo-area.h
+++ b/texinfo/info/echo-area.h
@@ -1,5 +1,5 @@
 /* echo-area.h -- Functions used in reading information from the echo area.
-   $Id: echo-area.h,v 1.1 1998/03/23 04:42:27 law Exp $
+   $Id: echo-area.h,v 1.2 1998/03/24 18:06:12 law Exp $
 
    This file is part of GNU Info, a program for reading online documentation
    stored in Info format.
diff --git a/texinfo/info/filesys.c b/texinfo/info/filesys.c
index 24d1d75071b2925420817ac12ddfc808feb249bf..6d449743aaa068a002d813689ed482206973639e 100644
--- a/texinfo/info/filesys.c
+++ b/texinfo/info/filesys.c
@@ -1,5 +1,5 @@
 /* filesys.c -- File system specific functions for hacking this system.
-   $Id: filesys.c,v 1.4 1997/07/24 21:23:07 karl Exp $
+   $Id: filesys.c,v 1.2 1998/03/24 18:06:16 law Exp $
 
    Copyright (C) 1993, 97 Free Software Foundation, Inc.
 
diff --git a/texinfo/info/filesys.h b/texinfo/info/filesys.h
index 440eb9b281b56461a337797b9fb44ec8bd0d72c7..4c85746c03d85f131d30edc689a509653c9e8840 100644
--- a/texinfo/info/filesys.h
+++ b/texinfo/info/filesys.h
@@ -1,5 +1,5 @@
 /* filesys.h -- External declarations of functions and vars in filesys.c.
-   $Id: filesys.h,v 1.3 1997/07/15 18:39:08 karl Exp $
+   $Id: filesys.h,v 1.1.1.2 1998/03/22 20:42:28 law Exp $
 
    This file is part of GNU Info, a program for reading online documentation
    stored in Info format.
diff --git a/texinfo/info/footnotes.c b/texinfo/info/footnotes.c
index b6467431b64eaccc80df64f6020f69a6712adabe..a71a7cbe725beef628ffd36703dcb9d165c80bfe 100644
--- a/texinfo/info/footnotes.c
+++ b/texinfo/info/footnotes.c
@@ -1,5 +1,5 @@
 /* footnotes.c -- Some functions for manipulating footnotes.
-   $Id: footnotes.c,v 1.4 1997/07/24 21:23:33 karl Exp $
+   $Id: footnotes.c,v 1.1.1.2 1998/03/22 20:42:29 law Exp $
 
    Copyright (C) 1993, 97 Free Software Foundation, Inc.
 
diff --git a/texinfo/info/footnotes.h b/texinfo/info/footnotes.h
index 3406bcb67be13e987e8c2a63cb7e7eeb1fd7d53d..aab3b4a9c77be2c1717a3340d00676e1ece99360 100644
--- a/texinfo/info/footnotes.h
+++ b/texinfo/info/footnotes.h
@@ -1,5 +1,5 @@
 /* footnotes.h -- Some functions for manipulating footnotes.
-   $Id: footnotes.h,v 1.3 1997/07/15 18:40:27 karl Exp $
+   $Id: footnotes.h,v 1.1.1.2 1998/03/22 20:42:30 law Exp $
 
    This file is part of GNU Info, a program for reading online documentation
    stored in Info format.
diff --git a/texinfo/info/gc.h b/texinfo/info/gc.h
index b4d993af4f8c65c8ec13e39fef563a7c8f4875c1..19c19bb3bc35277aaef2c5ee7ff1bb6191995501 100644
--- a/texinfo/info/gc.h
+++ b/texinfo/info/gc.h
@@ -1,5 +1,5 @@
 /* gc.h -- Functions for garbage collecting unused node contents.
-   $Id: gc.h,v 1.2 1997/07/15 18:41:53 karl Exp $
+   $Id: gc.h,v 1.1.1.2 1998/03/22 20:42:32 law Exp $
 
    This file is part of GNU Info, a program for reading online documentation
    stored in Info format.
diff --git a/texinfo/info/indices.c b/texinfo/info/indices.c
index 37e9b037762b33b1112947919333eac359211cbd..03e4b35a75a0a2ce8d8bcd54295cfd529dfb3e55 100644
--- a/texinfo/info/indices.c
+++ b/texinfo/info/indices.c
@@ -1,5 +1,5 @@
 /* indices.c -- Commands for dealing with an Info file Index.
-   $Id: indices.c,v 1.6 1997/07/24 21:25:53 karl Exp $
+   $Id: indices.c,v 1.1.1.2 1998/03/22 20:42:33 law Exp $
 
    Copyright (C) 1993, 97 Free Software Foundation, Inc.
 
diff --git a/texinfo/info/indices.h b/texinfo/info/indices.h
index 8b8a7070c0b17d7e3ddc460c94e6bd3b0f3eb57c..7625300c15fb52bf61ee351bdd5a038cff7627fd 100644
--- a/texinfo/info/indices.h
+++ b/texinfo/info/indices.h
@@ -1,5 +1,5 @@
 /* indices.h -- Functions defined in indices.c.
-   $Id: indices.h,v 1.2 1997/07/06 20:50:29 karl Exp $
+   $Id: indices.h,v 1.1.1.2 1998/03/22 20:42:34 law Exp $
 
    This file is part of GNU Info, a program for reading online documentation
    stored in Info format.
diff --git a/texinfo/info/info-stnd.texi b/texinfo/info/info-stnd.texi
index 1e2fccb1d8e2bb63d46aded1de5383b31588e837..8ff3fc574b9eaeae5e245e19a4aa1ce6c5f26e2e 100644
--- a/texinfo/info/info-stnd.texi
+++ b/texinfo/info/info-stnd.texi
@@ -9,7 +9,7 @@
 @synindex fn cp
 @synindex ky cp
 @comment %**end of header
-@comment $Id: info-stnd.texi,v 1.1 1997/08/21 22:58:01 jason Exp $
+@comment $Id: info-stnd.texi,v 1.1.1.1 1997/08/21 22:58:01 jason Exp $
 
 @dircategory Texinfo documentation system
 @direntry
diff --git a/texinfo/info/info-utils.h b/texinfo/info/info-utils.h
index 879587c484437f77d3275bd5e81a60fa3fe8a8c7..8c526c40f138bb8d4cb904137233586db87aedd0 100644
--- a/texinfo/info/info-utils.h
+++ b/texinfo/info/info-utils.h
@@ -1,5 +1,5 @@
 /* info-utils.h -- Exported functions and variables from info-util.c.
-   $Id: info-utils.h,v 1.3 1997/07/15 18:42:20 karl Exp $   
+   $Id: info-utils.h,v 1.1.1.2 1998/03/22 20:42:36 law Exp $   
 
    This file is part of GNU Info, a program for reading online documentation
    stored in Info format.
diff --git a/texinfo/info/info.c b/texinfo/info/info.c
index 9b46edfcfc05503f65ce9b02e0a38f28c5262e58..6642182c6e16d843f2cae36fc4425b0818da1af2 100644
--- a/texinfo/info/info.c
+++ b/texinfo/info/info.c
@@ -1,5 +1,5 @@
 /* info.c -- Display nodes of Info files in multiple windows.
-   $Id: info.c,v 1.10 1997/07/30 15:21:44 karl Exp $
+   $Id: info.c,v 1.2 1998/03/24 18:06:30 law Exp $
 
    Copyright (C) 1993, 96, 97 Free Software Foundation, Inc.
 
diff --git a/texinfo/info/info.h b/texinfo/info/info.h
index e8be98ed42f592eb04be88373bc6a6773682601b..a0c78f80f48cd27f6501b86baeaee306600cdf08 100644
--- a/texinfo/info/info.h
+++ b/texinfo/info/info.h
@@ -1,5 +1,5 @@
 /* info.h -- Header file which includes all of the other headers.
-   $Id: info.h,v 1.6 1997/07/15 18:34:15 karl Exp $
+   $Id: info.h,v 1.2 1998/03/24 18:06:31 law Exp $
 
    This file is part of GNU Info, a program for reading online documentation
    stored in Info format.
diff --git a/texinfo/info/info.texi b/texinfo/info/info.texi
index efc3077e339c0d3006a679b86ff0bd747e99a7b3..f76b84c25d3656918ad4d840dcc0d06ec5088121 100644
--- a/texinfo/info/info.texi
+++ b/texinfo/info/info.texi
@@ -3,7 +3,7 @@
 @setfilename info.info
 @settitle Info 1.0
 @comment %**end of header 
-@comment $Id: info.texi,v 1.1 1997/08/21 22:58:02 jason Exp $
+@comment $Id: info.texi,v 1.1.1.1 1997/08/21 22:58:02 jason Exp $
 
 @ifinfo
 @c This is a dir.info fragment to support semi-automated addition of
diff --git a/texinfo/info/infodoc.c b/texinfo/info/infodoc.c
index 4fc0419c5f90eaea392481239e8a786db2d9f91d..925425a432445c031e7c947ffab25b6b387dcd4e 100644
--- a/texinfo/info/infodoc.c
+++ b/texinfo/info/infodoc.c
@@ -1,5 +1,5 @@
 /* infodoc.c -- Functions which build documentation nodes.
-   $Id: infodoc.c,v 1.4 1997/07/25 21:08:40 karl Exp $
+   $Id: infodoc.c,v 1.1.1.2 1998/03/22 20:42:39 law Exp $
 
    Copyright (C) 1993, 97 Free Software Foundation, Inc.
 
diff --git a/texinfo/info/infomap.c b/texinfo/info/infomap.c
index 7591283dc5923e04be64a1c701c46d605cfcf0f0..f129335b006bcdf179cc9271ae5579e6e6777a7a 100644
--- a/texinfo/info/infomap.c
+++ b/texinfo/info/infomap.c
@@ -1,5 +1,5 @@
 /* infomap.c -- Keymaps for Info.
-   $Id: infomap.c,v 1.7 1997/07/31 20:37:32 karl Exp $
+   $Id: infomap.c,v 1.1.1.2 1998/03/22 20:42:40 law Exp $
 
    Copyright (C) 1993, 97 Free Software Foundation, Inc.
 
diff --git a/texinfo/info/m-x.c b/texinfo/info/m-x.c
index 28b8e80e730b400cb11c1e746d48c1e15b63ab34..c32a8899ff639f26e6448f97d347879b09bf355b 100644
--- a/texinfo/info/m-x.c
+++ b/texinfo/info/m-x.c
@@ -1,5 +1,5 @@
 /* m-x.c -- Meta-X minibuffer reader.
-   $Id: m-x.c,v 1.5 1997/07/24 21:28:00 karl Exp $
+   $Id: m-x.c,v 1.1.1.2 1998/03/22 20:42:42 law Exp $
 
    Copyright (C) 1993, 97 Free Software Foundation, Inc.
 
diff --git a/texinfo/info/makedoc.c b/texinfo/info/makedoc.c
index c88663fcddf1239105ba2fb581736fa614be16da..d0dc7a42f4870ba8db72fbf35665e72c6b43b689 100644
--- a/texinfo/info/makedoc.c
+++ b/texinfo/info/makedoc.c
@@ -1,5 +1,5 @@
 /* makedoc.c -- Make doc.c and funs.h from input files.
-   $Id: makedoc.c,v 1.4 1997/07/15 18:35:59 karl Exp $
+   $Id: makedoc.c,v 1.1.1.2 1998/03/22 20:42:43 law Exp $
 
    This file is part of GNU Info, a program for reading online documentation
    stored in Info format.
diff --git a/texinfo/info/man.h b/texinfo/info/man.h
index 3cf4b162a503a96e50387f2827519572b7e4c1c7..2c3e36d3f4ab69d1d19e0fffaef1a4ba137a58fe 100644
--- a/texinfo/info/man.h
+++ b/texinfo/info/man.h
@@ -1,5 +1,5 @@
 /* man.h: Defines and external function declarations for man.c.
-   $Id: man.h,v 1.2 1997/07/15 18:42:56 karl Exp $
+   $Id: man.h,v 1.1.1.2 1998/03/22 20:42:46 law Exp $
 
    This file is part of GNU Info, a program for reading online documentation
    stored in Info format.
diff --git a/texinfo/info/nodemenu.c b/texinfo/info/nodemenu.c
index 263265747427d85a74c4de00653b163eabf2f20b..6bd2ebbe1b09ece613aa4168f264817610f3ae8e 100644
--- a/texinfo/info/nodemenu.c
+++ b/texinfo/info/nodemenu.c
@@ -1,5 +1,5 @@
 /* nodemenu.c -- Produce a menu of all visited nodes.
-   $Id: nodemenu.c,v 1.7 1997/07/24 21:30:30 karl Exp $
+   $Id: nodemenu.c,v 1.1.1.2 1998/03/22 20:42:47 law Exp $
 
    Copyright (C) 1993, 97 Free Software Foundation, Inc.
 
diff --git a/texinfo/info/nodes.h b/texinfo/info/nodes.h
index a96c07c8a6e3304a2f256c0c2d43ee71f2fe88df..0ddc342a687c7c28473a77f0c543617382093e3d 100644
--- a/texinfo/info/nodes.h
+++ b/texinfo/info/nodes.h
@@ -1,5 +1,5 @@
 /* nodes.h -- How we represent nodes internally.
-   $Id: nodes.h,v 1.5 1997/07/18 14:33:44 karl Exp $
+   $Id: nodes.h,v 1.1.1.2 1998/03/22 20:42:49 law Exp $
 
    This file is part of GNU Info, a program for reading online documentation
    stored in Info format.
diff --git a/texinfo/info/search.h b/texinfo/info/search.h
index 6425536f1724b646ae3f0b1e29c75792af05bbfa..fc32185c91bcfc52581499e991c4dd28e45e67e1 100644
--- a/texinfo/info/search.h
+++ b/texinfo/info/search.h
@@ -1,5 +1,5 @@
 /* search.h -- Structure used to search large bodies of text, with bounds.
-   $Id: search.h,v 1.3 1997/07/15 18:43:49 karl Exp $
+   $Id: search.h,v 1.1.1.2 1998/03/22 20:42:51 law Exp $
 
    This file is part of GNU Info, a program for reading online documentation
    stored in Info format.
diff --git a/texinfo/info/session.c b/texinfo/info/session.c
index a30bbfe6d746aa1480e83ae91862275f37fa8e44..e99301b8d0d3cd9b6cea8c3f206b635d4ae17f52 100644
--- a/texinfo/info/session.c
+++ b/texinfo/info/session.c
@@ -1,5 +1,5 @@
 /* session.c -- The user windowing interface to Info.
-   $Id: session.c,v 1.12 1997/07/24 21:34:00 karl Exp $
+   $Id: session.c,v 1.2 1998/03/24 18:06:46 law Exp $
 
    Copyright (C) 1993, 96, 97 Free Software Foundation, Inc.
 
diff --git a/texinfo/info/signals.h b/texinfo/info/signals.h
index 3a45925a1831d8a65afaa4e5d765664958a41772..7252f2d2ac4cb0220c63313efe34c8c8d0fd712d 100644
--- a/texinfo/info/signals.h
+++ b/texinfo/info/signals.h
@@ -1,5 +1,5 @@
 /* signals.h -- Header to include system dependent signal definitions.
-   $Id: signals.h,v 1.3 1997/07/15 18:35:59 karl Exp $
+   $Id: signals.h,v 1.1.1.2 1998/03/22 20:42:55 law Exp $
 
    This file is part of GNU Info, a program for reading online documentation
    stored in Info format.
diff --git a/texinfo/info/tilde.c b/texinfo/info/tilde.c
index fef953a04dc6350da062ae0b4d51201f0b4b37e9..46c3a5a448c779a5929f9ef87d6a42494d1f2b98 100644
--- a/texinfo/info/tilde.c
+++ b/texinfo/info/tilde.c
@@ -1,5 +1,5 @@
 /* tilde.c -- Tilde expansion code (~/foo := $HOME/foo).
-   $Id: tilde.c,v 1.8 1997/07/24 21:49:03 karl Exp $
+   $Id: tilde.c,v 1.2 1998/03/24 18:06:55 law Exp $
 
    This file is part of GNU Info, a program for reading online documentation
    stored in Info format.
diff --git a/texinfo/info/variables.c b/texinfo/info/variables.c
index 248c8af6488bde4aca4db83418203a1cbb0b380a..e1c2ac4d2bd694cb59a50da9f3290ee24b49a010 100644
--- a/texinfo/info/variables.c
+++ b/texinfo/info/variables.c
@@ -1,5 +1,5 @@
 /* variables.c -- How to manipulate user visible variables in Info.
-   $Id: variables.c,v 1.5 1997/07/18 14:34:23 karl Exp $
+   $Id: variables.c,v 1.1.1.2 1998/03/22 20:43:01 law Exp $
 
    This file is part of GNU Info, a program for reading online documentation
    stored in Info format.
diff --git a/texinfo/info/variables.h b/texinfo/info/variables.h
index 1afcfb8d72dd3ed16663a9ac620aef13ed4bdfdb..106ec921ce87555320ca972b94c936cc6a62027f 100644
--- a/texinfo/info/variables.h
+++ b/texinfo/info/variables.h
@@ -1,5 +1,5 @@
 /* variables.h -- Description of user visible variables in Info.
-   $Id: variables.h,v 1.3 1997/07/15 18:44:23 karl Exp $
+   $Id: variables.h,v 1.1.1.2 1998/03/22 20:43:02 law Exp $
 
    This file is part of GNU Info, a program for reading online documentation
    stored in Info format.
diff --git a/texinfo/info/window.c b/texinfo/info/window.c
index 56a310838e253edb7b59f82dfc7d2a327c38e2f2..4357e656b87cd18029208a22a09f66dbf2818733 100644
--- a/texinfo/info/window.c
+++ b/texinfo/info/window.c
@@ -1,5 +1,5 @@
 /* window.c -- Windows in Info.
-   $Id: window.c,v 1.4 1997/07/15 18:35:59 karl Exp $
+   $Id: window.c,v 1.2 1998/03/24 18:06:59 law Exp $
 
    This file is part of GNU Info, a program for reading online documentation
    stored in Info format.
diff --git a/texinfo/info/window.h b/texinfo/info/window.h
index 17367cbd5a405331be49b45e798e337691e18340..c0f3b035520a36ba33da6cc91a7b67953d1908f1 100644
--- a/texinfo/info/window.h
+++ b/texinfo/info/window.h
@@ -1,5 +1,5 @@
 /* window.h -- Structure and flags used in manipulating Info windows.
-   $Id: window.h,v 1.4 1997/07/15 18:45:47 karl Exp $
+   $Id: window.h,v 1.1.1.2 1998/03/22 20:43:04 law Exp $
 
    This file is part of GNU Info, a program for reading online documentation
    stored in Info format.
diff --git a/texinfo/lib/Makefile.am b/texinfo/lib/Makefile.am
index 723912c5734f8966113ef66ecf092430a7da82fe..c3a8e98af85cf6d92c4981b81e5593df8db87dcd 100644
--- a/texinfo/lib/Makefile.am
+++ b/texinfo/lib/Makefile.am
@@ -1,5 +1,5 @@
 ## Makefile.am for texinfo/lib.
-## $Id: Makefile.am,v 1.1 1998/03/23 04:43:06 law Exp $
+## $Id: Makefile.am,v 1.2 1998/03/24 18:07:26 law Exp $
 ## Run automake in .. to produce Makefile.in from this.
 
 noinst_LIBRARIES = libtxi.a
diff --git a/texinfo/lib/system.h b/texinfo/lib/system.h
index c36ac10d9d616aa29ee2f3bec9a3c968ee42a549..1a0a976848500a4a5bf6498f9be69539cfe3cc55 100644
--- a/texinfo/lib/system.h
+++ b/texinfo/lib/system.h
@@ -1,5 +1,5 @@
 /* system.h: System-dependent declarations.  Include this first.
-   $Id: system.h,v 1.1 1998/03/23 04:43:06 law Exp $
+   $Id: system.h,v 1.2 1998/03/24 18:07:37 law Exp $
 
    Copyright (C) 1997 Free Software Foundation, Inc.
 
diff --git a/texinfo/makeinfo/Makefile.am b/texinfo/makeinfo/Makefile.am
index 6f0231b72e1e58d448416db6ec68bcdb68bdc8ea..a715d8bf6d37870ed81355a54bf114844f123689 100644
--- a/texinfo/makeinfo/Makefile.am
+++ b/texinfo/makeinfo/Makefile.am
@@ -1,5 +1,5 @@
 ## Makefile.am for texinfo/makeinfo.
-## $Id: Makefile.am,v 1.1 1998/03/23 04:43:06 law Exp $
+## $Id: Makefile.am,v 1.2 1998/03/24 18:07:49 law Exp $
 ## Run automake in .. to produce Makefile.in from this.
 
 bin_PROGRAMS = makeinfo
diff --git a/texinfo/makeinfo/makeinfo.h b/texinfo/makeinfo/makeinfo.h
index 205a3bdf0415a3c1695c97df86ec733added8cde..dccb0b78dadc59837572c0a22d2c46d7200a5fd6 100644
--- a/texinfo/makeinfo/makeinfo.h
+++ b/texinfo/makeinfo/makeinfo.h
@@ -1,5 +1,5 @@
 /* makeinfo.h -- Declarations for Makeinfo.
-   $Id: makeinfo.h,v 1.3 1997/07/15 18:28:38 karl Exp $
+   $Id: makeinfo.h,v 1.1.1.2 1998/03/22 20:43:08 law Exp $
 
    Copyright (C) 1996, 97 Free Software Foundation, Inc.
 
diff --git a/texinfo/makeinfo/makeinfo.texi b/texinfo/makeinfo/makeinfo.texi
index 04c136875ab866f5e922d92bf2d178c302a5f8d2..cb10e6e40c87d4f2b16105a24f8f3a89dde417d6 100644
--- a/texinfo/makeinfo/makeinfo.texi
+++ b/texinfo/makeinfo/makeinfo.texi
@@ -4,7 +4,7 @@
 @set VERSION 1.61
 @paragraphindent none
 @comment %**start of header
-@comment $Id: makeinfo.texi,v 1.1 1997/08/21 22:58:08 jason Exp $
+@comment $Id: makeinfo.texi,v 1.1.1.1 1997/08/21 22:58:08 jason Exp $
 
 @ifinfo
 @format
diff --git a/texinfo/makeinfo/multi.c b/texinfo/makeinfo/multi.c
index 99c380d3dd95b6992e71cec29a8baa6a9c8ade90..ccc8a8731027202c46979af5541a3c1116390c98 100644
--- a/texinfo/makeinfo/multi.c
+++ b/texinfo/makeinfo/multi.c
@@ -1,5 +1,5 @@
 /* multi.c -- multitable stuff for makeinfo.
-   $Id: multi.c,v 1.9 1997/07/24 22:01:00 karl Exp $
+   $Id: multi.c,v 1.2 1998/03/24 18:07:57 law Exp $
 
    Copyright (C) 1996, 97 Free Software Foundation, Inc.
 
diff --git a/texinfo/po/cat-id-tbl.c b/texinfo/po/cat-id-tbl.c
index 8e7d2b04ee09facf9ea850cbae7aadd3e97713cc..e0d2ce8083b310b44a930619d3f86ce4b307b347 100644
--- a/texinfo/po/cat-id-tbl.c
+++ b/texinfo/po/cat-id-tbl.c
@@ -498,4 +498,4 @@ Email bug reports to bug-texinfo@prep.ai.mit.edu.", 358},
   {"%s; for file `%s'.\n", 363},
   {"Virtual memory exhausted in %s ()!  Needed %d bytes.", 364},
 };
-
+int _msg_tbl_length = 364;
diff --git a/texinfo/util/Makefile.am b/texinfo/util/Makefile.am
index d1f973e2d8bd6e2534246cb803009217b3f69175..6690cc14920fc42d1adedf1e6f22c6be34017211 100644
--- a/texinfo/util/Makefile.am
+++ b/texinfo/util/Makefile.am
@@ -1,5 +1,5 @@
 ## Makefile.am for texinfo/util.
-## $Id: Makefile.am,v 1.1 1998/03/23 04:43:11 law Exp $
+## $Id: Makefile.am,v 1.2 1998/03/24 18:08:38 law Exp $
 ## Run automake in .. to produce Makefile.in from this.
 
 bin_PROGRAMS = texindex
diff --git a/texinfo/util/gen-dir-node b/texinfo/util/gen-dir-node
index c7ef670c539324b59b272e32256b0575b4f55813..6c30ca0e700f63d0afc5699221a6ff14d386545f 100755
--- a/texinfo/util/gen-dir-node
+++ b/texinfo/util/gen-dir-node
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $Id: gen-dir-node,v 1.1 1997/05/22 22:02:43 karl Exp $
+# $Id: gen-dir-node,v 1.1.1.2 1998/03/22 20:43:12 law Exp $
 # Generate the top-level Info node, given a directory of Info files
 # and (optionally) a skeleton file.  The output will be suitable for a
 # top-level dir file.  The skeleton file contains info topic names in the
diff --git a/texinfo/util/mkinstalldirs b/texinfo/util/mkinstalldirs
index 934c67149230672a9e5ce8f208cc7a1ec9fd9e9d..840276b59201000912cfaf81ccc41412f0d226e8 100755
--- a/texinfo/util/mkinstalldirs
+++ b/texinfo/util/mkinstalldirs
@@ -4,7 +4,7 @@
 # Created: 1993-05-16
 # Public domain
 
-# $Id: mkinstalldirs,v 1.1 1997/08/21 22:58:12 jason Exp $
+# $Id: mkinstalldirs,v 1.1.1.1 1997/08/21 22:58:12 jason Exp $
 
 errstatus=0
 
diff --git a/texinfo/util/texi2dvi b/texinfo/util/texi2dvi
index 67a95121b7c8fff07f00197853d36313c5c158ac..8363f5ebbfda88dc0055cc6b3f5563f96f691fa8 100755
--- a/texinfo/util/texi2dvi
+++ b/texinfo/util/texi2dvi
@@ -3,7 +3,7 @@
 
 # Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
 
-# $Id: texi2dvi,v 0.6 1997/07/14 19:23:18 karl Exp $
+# $Id: texi2dvi,v 1.2 1998/03/24 18:08:49 law Exp $
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -47,7 +47,7 @@
 progname=`echo "$0" | sed -e 's/[^\/]*\///g'`
 
 # This string is expanded by rcs automatically when this file is checked out.
-rcs_revision='$Revision: 0.6 $'
+rcs_revision='$Revision: 1.2 $'
 version=`set - $rcs_revision; echo $2`
 
 # To prevent hairy quoting and escaping later.
@@ -329,6 +329,3 @@ done
 
 $verbose "$0 done."
 true # exit successfully.
-# Do macro expansion with makeinfo before running TeX.
-# Various expansion safety measures added for test; avoid use of -o.
-#
diff --git a/texinfo/util/texindex.c b/texinfo/util/texindex.c
index 2b3bd20c30db66f6c77654b305c9988c76a1b5a7..d0655fb12288c47d6638332da1c32e368f92b44c 100644
--- a/texinfo/util/texindex.c
+++ b/texinfo/util/texindex.c
@@ -1,5 +1,5 @@
 /* Prepare TeX index dribble output into an actual index.
-   $Id: texindex.c,v 1.17 1997/07/24 23:34:45 karl Exp $
+   $Id: texindex.c,v 1.2 1998/03/24 18:08:47 law Exp $
 
    Copyright (C) 1987, 91, 92, 96, 97 Free Software Foundation, Inc.