Import of m4-1.4jm4-1.4j

105 files changed, 714 insertions, 598 deletions

diff --git a/ChangeLog b/ChangeLog
index ae91cdc8..3b3012d6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,29 @@
+1998-10-07  Rene' Seindal  <rene@seindal.dk>
+
+	* tests/Makefile.am (GENERATED_TESTS): Changed .m4 extension to
+	.test, as the files are no longer just m4 input.
+
+	* tests/get-them (FILE): Changed .m4 extension to .test.
+
+	* src/m4.h (token_type): New token type TOKEN_SPACE introduced.
+	Otherwise quoted strings with leading whitespace first in a macro
+	argument would be eliminated.
+
+	* src/macro.c (expand_token): Handles new token type TOKEN_SPACE.
+	(expand_argument): Do.
+
+	* src/input.c (next_token): SPACE and NUM/OTHER characters are only
+	grouped together iff both quote and comment strings are single
+	character.  Otherwise they might include a comment/quote leader.
+	(next_token): Returns new token type TOKEN_SPACE.
+
+	* src/builtin.c (push_builtin_table): New function to push a
+	builtin_table on the stack without installing its contents.
+	(find_builtin_by_name): Added call to push_builtin_table() if
+	reading frozen files.  Otherwise the builtins named in the frozen
+	files could not be found.
+	(install_builtin_table): Changed to use push_builtin_table()
+
 1998-10-04  Rene' Seindal  <rene@seindal.dk>
 
 	* Prerelease 1.4i.
diff --git a/NEWS b/NEWS
index e92a4360..1dfbcfba 100644
--- a/NEWS
+++ b/NEWS
@@ -1,7 +1,7 @@
 GNU m4 NEWS - History of user-visible changes.              -*-indented-text-*-
 Copyright (C) 1992, 1993, 1994, 1998 Free Software Foundation, Inc.
 
-Version beta 1.4i - October 1998, by Erick Branderhorst and Rene' Seindal
+Version beta 1.4j - October 1998, by Erick Branderhorst and Rene' Seindal
 
 * GNU m4 now uses gettext to support internationalization.
 
diff --git a/TODO b/TODO
index e0c2e625..0e88b577 100644
--- a/TODO
+++ b/TODO
@@ -9,6 +9,9 @@ for any of these ideas or if you have others to add.
   + Changes in the syntax_table are not saved to frozen files (René
     Seindal).
 
+  + Information about loaded modules is not saved to frozen files (René
+    Seindal).
+
   + m4wrap.1.test fail on Solaris 2.6 using egcs 1.1a compiler (Erick B).
 
   + The $ used in user defined macros cannot be changed through
@@ -23,6 +26,11 @@ for any of these ideas or if you have others to add.
   + An escape character (like in TeX) should be definable through the
     syntax table (René Seindal).
 
+  + Sort out all the weird forms of interaction between changesyntax,
+    changecom and changequote.  What happens if you install a quote with
+    changequote and removes it with changesyntax and vice versa (René
+    Seindal).
+
 * Optimization and clean up
 
   + Have NULs go really undisturbed through GNU m4
diff --git a/configure b/configure
index c53026e8..77dee6f6 100755
--- a/configure
+++ b/configure
@@ -708,7 +708,7 @@ fi
 
 PACKAGE=m4
 
-VERSION=1.4i
+VERSION=1.4j
 
 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
   { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; }
diff --git a/configure.in b/configure.in
index 5220f6bf..ad2ed484 100644
--- a/configure.in
+++ b/configure.in
@@ -8,7 +8,7 @@ AC_INIT(src/m4.c)
 AM_CONFIG_HEADER(config.h)
 AC_ARG_PROGRAM
 
-AM_INIT_AUTOMAKE(m4,1.4i)
+AM_INIT_AUTOMAKE(m4,1.4j)
 ALL_LINGUAS="de fr it ja nl pl ru sv"
 
 AC_PROG_AWK
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 0631611a..ad573342 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -10,7 +10,8 @@ PERL = @PERL@
 	@if test -f ../src/$*; then \
 	  echo "Updating the \`man' page \`$@'"; \
 	  $(PERL) $(srcdir)/helptoman.pl ../src/$* > $@-tmp; \
-	  mv $@-tmp $(srcdir)/$@; \
+	  cmp $@-tmp $(srcdir)/$@ || cp $@-tmp $(srcdir)/$@; \
+	  rm -f $@-tmp; \
 	else \
 	  echo "WARNING: The \`man' page \`$@' cannot be updated yet."; \
 	  echo "         Retry once the program executable will be ready."; \
diff --git a/doc/Makefile.in b/doc/Makefile.in
index 321ea5c1..9ff4cb12 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -369,7 +369,8 @@ maintainer-clean-generic clean mostlyclean distclean maintainer-clean
 	@if test -f ../src/$*; then \
 	  echo "Updating the \`man' page \`$@'"; \
 	  $(PERL) $(srcdir)/helptoman.pl ../src/$* > $@-tmp; \
-	  mv $@-tmp $(srcdir)/$@; \
+	  cmp $@-tmp $(srcdir)/$@ || cp $@-tmp $(srcdir)/$@; \
+	  rm -f $@-tmp; \
 	else \
 	  echo "WARNING: The \`man' page \`$@' cannot be updated yet."; \
 	  echo "         Retry once the program executable will be ready."; \
diff --git a/doc/m4.info b/doc/m4.info
index 87dfb445..aa235fb1 100644
--- a/doc/m4.info
+++ b/doc/m4.info
@@ -28,7 +28,7 @@ translation approved by the Foundation.
 Indirect:
 m4.info-1: 973
 m4.info-2: 49992
-m4.info-3: 97841
+m4.info-3: 97837
 
 Tag Table:
 (Indirect)
@@ -74,44 +74,44 @@ Node: Dnl54889
 Node: Changequote56015
 Node: Changecom57379
 Node: Changesyntax58665
-Node: Changeword64939
-Node: M4wrap68174
-Node: File Inclusion69376
-Node: Include69692
-Node: Search Path71711
-Node: Diversions72498
-Node: Divert73735
-Node: Undivert74867
-Node: Divnum76838
-Node: Cleardiv77383
-Node: Text handling78438
-Node: Len79158
-Node: Index79556
-Node: Regexp80141
-Node: Substr81232
-Node: Translit81852
-Node: Patsubst83295
-Node: Format85386
-Node: Arithmetic86875
-Node: Incr87332
-Node: Eval87836
-Node: UNIX commands91442
-Node: Syscmd91913
-Node: Esyscmd92626
-Node: Sysval93574
-Node: Maketemp93981
-Node: Miscellaneous95038
-Node: Errprint95469
-Node: M4exit96451
-Node: Syncoutput97249
-Node: Frozen files97841
-Node: Compatibility102760
-Node: Extensions103376
-Node: Incompatibilities105846
-Node: Other Incompat106288
-Node: Experiments108451
-Node: Answers109958
-Node: Concept index110590
-Node: Macro index118011
+Node: Changeword64935
+Node: M4wrap68170
+Node: File Inclusion69372
+Node: Include69688
+Node: Search Path71707
+Node: Diversions72494
+Node: Divert73731
+Node: Undivert74863
+Node: Divnum76834
+Node: Cleardiv77379
+Node: Text handling78434
+Node: Len79154
+Node: Index79552
+Node: Regexp80137
+Node: Substr81228
+Node: Translit81848
+Node: Patsubst83291
+Node: Format85382
+Node: Arithmetic86871
+Node: Incr87328
+Node: Eval87832
+Node: UNIX commands91438
+Node: Syscmd91909
+Node: Esyscmd92622
+Node: Sysval93570
+Node: Maketemp93977
+Node: Miscellaneous95034
+Node: Errprint95465
+Node: M4exit96447
+Node: Syncoutput97245
+Node: Frozen files97837
+Node: Compatibility102756
+Node: Extensions103372
+Node: Incompatibilities105842
+Node: Other Incompat106284
+Node: Experiments108447
+Node: Answers109954
+Node: Concept index110586
+Node: Macro index118007
 
 End Tag Table
diff --git a/doc/m4.info-1 b/doc/m4.info-1
index 133dc931..ae42c37a 100644
--- a/doc/m4.info-1
+++ b/doc/m4.info-1
@@ -42,7 +42,7 @@ changes by Franc,ois Pinard and other volunteers on the Internet.  All
 names and email addresses can be found in the file `THANKS' from the
 GNU `m4' distribution.
 
-   This is release 1.4i.  It is now to be considered stable, future
+   This is release 1.4j.  It is now to be considered stable, future
 releases are only meant to fix bugs, increase speed, or improve
 documentation.  However...
 
diff --git a/doc/m4.info-2 b/doc/m4.info-2
index f31e53e7..3541001d 100644
--- a/doc/m4.info-2
+++ b/doc/m4.info-2
@@ -524,7 +524,7 @@ character quote and vice versa.  The same goes for comment delimiters.
      test([testing>>])
      =>==testing>>==
      test([<<testing>>])
-     =>==<<testing>>==
+     =>==testing==
 
 Note how it is possible to have both long and short quotes, if
 `changequote' is used before `changesyntax'.
diff --git a/doc/m4.texinfo b/doc/m4.texinfo
index 0e969ff6..9fb6e57a 100644
--- a/doc/m4.texinfo
+++ b/doc/m4.texinfo
@@ -2243,7 +2243,7 @@ test(<<testing]>>)
 test([testing>>])
 @result{}==testing>>==
 test([<<testing>>])
-@result{}==<<testing>>==
+@result{}==testing==
 @end example
 
 @noindent
diff --git a/doc/stamp-vti b/doc/stamp-vti
index 52950002..9de1289d 100644
--- a/doc/stamp-vti
+++ b/doc/stamp-vti
@@ -1,3 +1,3 @@
-@set UPDATED 4 October 1998
-@set EDITION 1.4i
-@set VERSION 1.4i
+@set UPDATED 6 October 1998
+@set EDITION 1.4j
+@set VERSION 1.4j
diff --git a/doc/version.texi b/doc/version.texi
index 52950002..9de1289d 100644
--- a/doc/version.texi
+++ b/doc/version.texi
@@ -1,3 +1,3 @@
-@set UPDATED 4 October 1998
-@set EDITION 1.4i
-@set VERSION 1.4i
+@set UPDATED 6 October 1998
+@set EDITION 1.4j
+@set VERSION 1.4j
diff --git a/modules/Makefile.in b/modules/Makefile.in
index 06248f02..d4b9b5be 100644
--- a/modules/Makefile.in
+++ b/modules/Makefile.in
@@ -117,7 +117,7 @@ time_so_LDFLAGS =
 CFLAGS = @CFLAGS@
 COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 LINK = $(CC) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
-DIST_COMMON =  README Makefile.am Makefile.in
+DIST_COMMON =  README Makefile.am Makefile.in TODO
 
 
 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
diff --git a/po/cat-id-tbl.c b/po/cat-id-tbl.c
index e0c32e0a..ea66ccd4 100644
--- a/po/cat-id-tbl.c
+++ b/po/cat-id-tbl.c
@@ -120,20 +120,21 @@ If no FILE or if FILE is `-', standard input is read.\n", 60},
   {"INTERNAL ERROR: Bad token type in expand_argument ()", 65},
   {"INTERNAL ERROR: Bad symbol type in call_macro ()", 66},
   {"ERROR: Recursion limit of %d exceeded, use -L<N> to change it", 67},
-  {"ERROR: Cannot create temporary file for diversion", 68},
-  {"ERROR: Cannot flush diversion to temporary file", 69},
-  {"ERROR: Copying inserted file", 70},
-  {"ERROR: Reading inserted file", 71},
-  {"Cannot stat diversion", 72},
-  {"Path search for `%s' found `%s'", 73},
-  {"Module search for `%s' found `%s'", 74},
-  {"VMEM limit exceeded?\n", 75},
+  {"Error: cannot find module `%s'", 68},
+  {"ERROR: Cannot create temporary file for diversion", 69},
+  {"ERROR: Cannot flush diversion to temporary file", 70},
+  {"ERROR: Copying inserted file", 71},
+  {"ERROR: Reading inserted file", 72},
+  {"Cannot stat diversion", 73},
+  {"Path search for `%s' found `%s'", 74},
+  {"Module search for `%s' found `%s'", 75},
+  {"VMEM limit exceeded?\n", 76},
   {"\
 Memory bounds violation detected (SIGSEGV).  Either a stack overflow\n\
-occurred, or there is a bug in ", 76},
-  {".  Check for possible infinite recursion.\n", 77},
-  {"INTERNAL ERROR: Illegal mode to symbol_lookup ()", 78},
-  {"Name `%s' is unknown\n", 79},
+occurred, or there is a bug in ", 77},
+  {".  Check for possible infinite recursion.\n", 78},
+  {"INTERNAL ERROR: Illegal mode to symbol_lookup ()", 79},
+  {"Name `%s' is unknown\n", 80},
 };
 
-int _msg_tbl_length = 79;
+int _msg_tbl_length = 80;
diff --git a/po/de.gmo b/po/de.gmo
index e5030d9d..6ed16d76 100644
--- a/po/de.gmo
+++ b/po/de.gmo
diff --git a/po/de.po b/po/de.po
index ba2a46b9..0b5c470c 100644
--- a/po/de.po
+++ b/po/de.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: m4 1.4.3\n"
-"POT-Creation-Date: 1998-10-04 01:31+0200\n"
+"POT-Creation-Date: 1998-10-07 17:46+0200\n"
 "PO-Revision-Date: 1996-09-30 10:38 GMT+0100\n"
 "Last-Translator: Martin von Löwis <martin@mira.isdn.cs.tu-berlin.de>\n"
 "Language-Team: German <de@li.org>\n"
@@ -14,102 +14,102 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: src/builtin.c:317
+#: src/builtin.c:328
 #, c-format
 msgid "Warning: Too few arguments to built-in `%s'"
 msgstr "Warnung: Zu wenig Argumente für eingebaute Funktion `%s'"
 
-#: src/builtin.c:323
+#: src/builtin.c:334
 #, c-format
 msgid "Warning: Excess arguments to built-in `%s' ignored"
 msgstr ""
 "Warnung: Überschüssige Argumente für eingebaute Funktion `%s' ignoriert"
 
-#: src/builtin.c:351
+#: src/builtin.c:362
 #, c-format
 msgid "Non-numeric argument to built-in `%s'"
 msgstr "Nicht-numerisches Argument in eingebauter Funktion `%s'"
 
-#: src/builtin.c:450
+#: src/builtin.c:461
 msgid "INTERNAL ERROR: Bad token data type in define_macro ()"
 msgstr "INTERNER FEHLER: Falscher Datentyp des Tokens in define_macro ()"
 
-#: src/builtin.c:645 src/builtin.c:708 src/builtin.c:1331 src/builtin.c:1355
+#: src/builtin.c:656 src/builtin.c:719 src/builtin.c:1342 src/builtin.c:1366
 #, c-format
 msgid "Undefined name %s"
 msgstr "Name %s nicht definiert"
 
-#: src/builtin.c:673
+#: src/builtin.c:684
 msgid "INTERNAL ERROR: Builtin not found in builtin table!"
 msgstr "INTERNER FEHLER: Eingebaute Funktion nicht in Tabelle gefunden!"
 
-#: src/builtin.c:681
+#: src/builtin.c:692
 msgid "INTERNAL ERROR: Bad token data type in m4_dumpdef ()"
 msgstr "INTERNER FEHLER: Falscher Datentyp des Tokens in m4_dumpdef ()"
 
-#: src/builtin.c:732
+#: src/builtin.c:743
 #, c-format
 msgid "Undefined macro `%s'"
 msgstr "Makro `%s' nicht definiert"
 
-#: src/builtin.c:772
+#: src/builtin.c:783
 msgid "INTERNAL ERROR: Bad symbol type in m4_defn ()"
 msgstr "INTERNER FEHLER: Falscher Symboltyp in m4_defn ()"
 
-#: src/builtin.c:838
+#: src/builtin.c:849
 #, c-format
 msgid "Cannot open pipe to command `%s'"
 msgstr "Kann keine `pipe' für Kommando `%s' öffnen"
 
-#: src/builtin.c:875
+#: src/builtin.c:886
 #, c-format
 msgid "Radix in eval out of range (radix = %d)"
 msgstr "Basis in `eval' nicht in den Grenzen (Basis = %d)"
 
-#: src/builtin.c:884
+#: src/builtin.c:895
 msgid "Negative width to eval"
 msgstr "Negative Breite in `eval'"
 
-#: src/builtin.c:976
+#: src/builtin.c:987
 #, c-format
 msgid "Non-numeric argument to %s"
 msgstr "Nicht-numerisches Argument in %s"
 
-#: src/builtin.c:988
+#: src/builtin.c:999
 #, c-format
 msgid "Cannot undivert %s"
 msgstr "Kann Umleitung %s nicht aufheben"
 
-#: src/builtin.c:1132
+#: src/builtin.c:1143
 #, fuzzy, c-format
 msgid "Undefined syntax code %c"
 msgstr "Name %s nicht definiert"
 
-#: src/builtin.c:1182 src/freeze.c:207
+#: src/builtin.c:1193 src/freeze.c:207
 #, c-format
 msgid "Cannot open %s"
 msgstr "Kann %s nicht öffnen"
 
-#: src/builtin.c:1391
+#: src/builtin.c:1402
 #, c-format
 msgid "Debugmode: bad debug flags: `%s'"
 msgstr "Debug Modus: falsche Debug Flags: `%s'"
 
-#: src/builtin.c:1427
+#: src/builtin.c:1438
 #, c-format
 msgid "Cannot set error file: %s"
 msgstr "Kann Fehlerdatei nicht vorbereiten: %s"
 
-#: src/builtin.c:1644
+#: src/builtin.c:1655
 msgid "WARNING: \\0 will disappear, use \\& instead in replacements"
 msgstr "WARNUNG: \\0 wird wegfallen, benutze \\& stattdessen"
 
-#: src/builtin.c:1705 src/builtin.c:1765 src/input.c:979
+#: src/builtin.c:1716 src/builtin.c:1776 src/input.c:982
 #, c-format
 msgid "Bad regular expression `%s': %s"
 msgstr "Falscher regulärer Ausdruck `%s': %s"
 
-#: src/builtin.c:1716 src/builtin.c:1789
+#: src/builtin.c:1727 src/builtin.c:1800
 #, c-format
 msgid "Error matching regular expression `%s'"
 msgstr "Fehler beim Erkennen des regulären Ausdrucks `%s'"
@@ -202,41 +202,41 @@ msgstr ""
 "`%s' aus eingefrorener Datei nicht in Tabelle der eingebauten Funktionen "
 "gefunden!"
 
-#: src/input.c:306
+#: src/input.c:309
 #, c-format
 msgid "Input reverted to %s, line %d"
 msgstr "Eingabe zurückgenommen zu %s, Zeile %d"
 
-#: src/input.c:334
+#: src/input.c:337
 #, c-format
 msgid "Input read from %s"
 msgstr "Eingabe gelesen von %s"
 
-#: src/input.c:494
+#: src/input.c:497
 msgid "INTERNAL ERROR: Recursive push_string!"
 msgstr "INTERNER FEHLER: Rekursives push_string!"
 
-#: src/input.c:611
+#: src/input.c:614
 msgid "INTERNAL ERROR: Bad call to init_macro_token ()"
 msgstr "INTERNER FEHLER: Falscher Aufruf von init_macro_token ()"
 
-#: src/input.c:651
+#: src/input.c:654
 msgid "INTERNAL ERROR: Input stack botch in next_char ()"
 msgstr ""
 "INTERNER FEHLER: Kellerspeicher der Eingabe durcheinander in next_char ()"
 
-#: src/input.c:688
+#: src/input.c:691
 msgid "INTERNAL ERROR: Input stack botch in peek_input ()"
 msgstr ""
 "INTERNER FEHLER: Kellerspeicher der Eingabe durcheinander in peek_input ()"
 
 # This is the name of the input file when there is no current input file.
 # Is this ever printed in a message?
-#: src/input.c:791
+#: src/input.c:794
 msgid "NONE"
 msgstr "NONE"
 
-#: src/input.c:1130 src/input.c:1157
+#: src/input.c:1133 src/input.c:1160
 msgid "ERROR: EOF in string"
 msgstr "FEHLER: Dateiende in Zeichenkette"
 
@@ -396,28 +396,33 @@ msgstr "Falsche Debug Flags: `%s'"
 msgid "INTERNAL ERROR: Bad code in deferred arguments"
 msgstr "INTERNER FEHLER: Falscher Kode in zurückgestellten Argumenten"
 
-#: src/macro.c:92
+#: src/macro.c:93
 msgid "INTERNAL ERROR: Bad token type in expand_token ()"
 msgstr "INTERNER FEHLER: Falscher Datentyp des Tokens in expands_token ()"
 
-#: src/macro.c:158
+#: src/macro.c:159
 msgid "ERROR: EOF in argument list"
 msgstr "FEHLER: Dateiende in Argumentliste"
 
-#: src/macro.c:176
+#: src/macro.c:178
 msgid "INTERNAL ERROR: Bad token type in expand_argument ()"
 msgstr "INTERNER FEHLER: Falscher Typ des Tokens in expand_argument ()"
 
-#: src/macro.c:253
+#: src/macro.c:255
 msgid "INTERNAL ERROR: Bad symbol type in call_macro ()"
 msgstr "INTERNER FEHLER: Falsche Symboltyp in call_macro ()"
 
-#: src/macro.c:282
+#: src/macro.c:284
 #, c-format
 msgid "ERROR: Recursion limit of %d exceeded, use -L<N> to change it"
 msgstr ""
 "FEHLER: Grenze der Rekursion von %d überschritten, benutze -L<N> zur Änderung"
 
+#: src/module.c:128
+#, c-format
+msgid "Error: cannot find module `%s'"
+msgstr ""
+
 #: src/output.c:198
 msgid "ERROR: Cannot create temporary file for diversion"
 msgstr "FEHLER: Kann keine temporäre Datei für Umleitung erzeugen"
diff --git a/po/fr.gmo b/po/fr.gmo
index 4b76a657..25408fa9 100644
--- a/po/fr.gmo
+++ b/po/fr.gmo
diff --git a/po/fr.po b/po/fr.po
index 7b68d451..0763b22c 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: m4 1.4d\n"
-"POT-Creation-Date: 1998-10-04 01:31+0200\n"
+"POT-Creation-Date: 1998-10-07 17:46+0200\n"
 "PO-Revision-Date: 1998-05-23 11:53+02:00\n"
 "Last-Translator: Erick Branderhorst <Erick.Branderhorst@asml.nl>\n"
 "Language-Team: dutch <nl@li.org>\n"
@@ -15,102 +15,102 @@ msgstr ""
 "Content-Type: text/plain; charset=\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: src/builtin.c:317
+#: src/builtin.c:328
 #, c-format
 msgid "Warning: Too few arguments to built-in `%s'"
 msgstr "Attention: Trop peu d'arguments pour «%s» prédéfini"
 
-#: src/builtin.c:323
+#: src/builtin.c:334
 #, c-format
 msgid "Warning: Excess arguments to built-in `%s' ignored"
 msgstr "Attention: Les arguments superflus pour «%s» prédéfini sont ignorés"
 
-#: src/builtin.c:351
+#: src/builtin.c:362
 #, c-format
 msgid "Non-numeric argument to built-in `%s'"
 msgstr "Argument non-numérique pour «%s» prédéfini"
 
-#: src/builtin.c:450
+#: src/builtin.c:461
 msgid "INTERNAL ERROR: Bad token data type in define_macro ()"
 msgstr "ERREUR INTERNE: Mauvais type de lexème dans define_macro ()"
 
-#: src/builtin.c:645 src/builtin.c:708 src/builtin.c:1331 src/builtin.c:1355
+#: src/builtin.c:656 src/builtin.c:719 src/builtin.c:1342 src/builtin.c:1366
 #, c-format
 msgid "Undefined name %s"
 msgstr "Nom «%s» non-défini"
 
-#: src/builtin.c:673
+#: src/builtin.c:684
 msgid "INTERNAL ERROR: Builtin not found in builtin table!"
 msgstr "ERREUR INTERNE: Prédéfini introuvable dans la table des prédéfinis!"
 
-#: src/builtin.c:681
+#: src/builtin.c:692
 msgid "INTERNAL ERROR: Bad token data type in m4_dumpdef ()"
 msgstr "ERREUR INTERNE: Mauvais type de données pour lexème dans m4_dumpdef ()"
 
-#: src/builtin.c:732
+#: src/builtin.c:743
 #, c-format
 msgid "Undefined macro `%s'"
 msgstr "Macro «%s» non-défini"
 
-#: src/builtin.c:772
+#: src/builtin.c:783
 msgid "INTERNAL ERROR: Bad symbol type in m4_defn ()"
 msgstr "ERREUR INTERNE: Mauvais type de symbole dans m4_defn ()"
 
-#: src/builtin.c:838
+#: src/builtin.c:849
 #, c-format
 msgid "Cannot open pipe to command `%s'"
 msgstr "Incapable d'ouvrir un «pipe» pour la commande «%s»"
 
-#: src/builtin.c:875
+#: src/builtin.c:886
 #, c-format
 msgid "Radix in eval out of range (radix = %d)"
 msgstr "Base hors intervalle dans «eval» (base = %d)"
 
-#: src/builtin.c:884
+#: src/builtin.c:895
 msgid "Negative width to eval"
 msgstr "Largeur négative dans «eval»"
 
-#: src/builtin.c:976
+#: src/builtin.c:987
 #, c-format
 msgid "Non-numeric argument to %s"
 msgstr "Argument non-numérique pour %s"
 
-#: src/builtin.c:988
+#: src/builtin.c:999
 #, c-format
 msgid "Cannot undivert %s"
 msgstr "Incapble de ramener la diversion %s"
 
-#: src/builtin.c:1132
+#: src/builtin.c:1143
 #, fuzzy, c-format
 msgid "Undefined syntax code %c"
 msgstr "Nom «%s» non-défini"
 
-#: src/builtin.c:1182 src/freeze.c:207
+#: src/builtin.c:1193 src/freeze.c:207
 #, c-format
 msgid "Cannot open %s"
 msgstr "Incapable d'ouvrir %s"
 
-#: src/builtin.c:1391
+#: src/builtin.c:1402
 #, c-format
 msgid "Debugmode: bad debug flags: `%s'"
 msgstr "Debugmode: mauvais indicateurs de mise-au-point: «%s»"
 
-#: src/builtin.c:1427
+#: src/builtin.c:1438
 #, c-format
 msgid "Cannot set error file: %s"
 msgstr "Incapable de préparer le fichier d'erreurs: %s"
 
-#: src/builtin.c:1644
+#: src/builtin.c:1655
 msgid "WARNING: \\0 will disappear, use \\& instead in replacements"
 msgstr ""
 "ATTENTION: \\\\0 disparaîtra, utiliser \\\\& plutôt pour les remplacements"
 
-#: src/builtin.c:1705 src/builtin.c:1765 src/input.c:979
+#: src/builtin.c:1716 src/builtin.c:1776 src/input.c:982
 #, c-format
 msgid "Bad regular expression `%s': %s"
 msgstr "Mauvaise expression régulière «%s»: %s"
 
-#: src/builtin.c:1716 src/builtin.c:1789
+#: src/builtin.c:1727 src/builtin.c:1800
 #, c-format
 msgid "Error matching regular expression `%s'"
 msgstr "Erreur d'appariement pour l'expressio régulière «%s»"
@@ -203,37 +203,37 @@ msgid "`%s' from frozen file not found in builtin table!"
 msgstr ""
 "«%s» dans le fichier figé est introuvable dans la table des prédéfinis!"
 
-#: src/input.c:306
+#: src/input.c:309
 #, c-format
 msgid "Input reverted to %s, line %d"
 msgstr "Entrée reprise de %s, ligne %d"
 
-#: src/input.c:334
+#: src/input.c:337
 #, c-format
 msgid "Input read from %s"
 msgstr "Entrée lue de %s"
 
-#: src/input.c:494
+#: src/input.c:497
 msgid "INTERNAL ERROR: Recursive push_string!"
 msgstr "ERREUR INTERNE: Utilisation récursive de push_string!"
 
-#: src/input.c:611
+#: src/input.c:614
 msgid "INTERNAL ERROR: Bad call to init_macro_token ()"
 msgstr "ERREUR INTERNE: Mauvais appel à init_macro_token ()"
 
-#: src/input.c:651
+#: src/input.c:654
 msgid "INTERNAL ERROR: Input stack botch in next_char ()"
 msgstr "ERREUR INTERNE: Pile d'entrée douteuse dans next_char ()"
 
-#: src/input.c:688
+#: src/input.c:691
 msgid "INTERNAL ERROR: Input stack botch in peek_input ()"
 msgstr "ERREUR INTERNE: Pile d'entrée douteuse dans peek_input ()"
 
-#: src/input.c:791
+#: src/input.c:794
 msgid "NONE"
 msgstr "AUCUN"
 
-#: src/input.c:1130 src/input.c:1157
+#: src/input.c:1133 src/input.c:1160
 msgid "ERROR: EOF in string"
 msgstr "ERREUR: Fin-de-fichier dans la chaîne"
 
@@ -392,28 +392,33 @@ msgstr "Mauvais indicateurs de mise-au-point: «%s»"
 msgid "INTERNAL ERROR: Bad code in deferred arguments"
 msgstr "ERREUR INTERNE: Mauvais code dans les arguments différés"
 
-#: src/macro.c:92
+#: src/macro.c:93
 msgid "INTERNAL ERROR: Bad token type in expand_token ()"
 msgstr "ERREUR: Débordement de pile.  (Récursion hors contrôle sur «define»?)"
 
-#: src/macro.c:158
+#: src/macro.c:159
 msgid "ERROR: EOF in argument list"
 msgstr "ERREUR: Fin-de-fichier dans la liste d'arguments"
 
-#: src/macro.c:176
+#: src/macro.c:178
 msgid "INTERNAL ERROR: Bad token type in expand_argument ()"
 msgstr ""
 "ERREUR INTERNE: Mauvais type de données pour lexème dans expand_argument ()"
 
-#: src/macro.c:253
+#: src/macro.c:255
 msgid "INTERNAL ERROR: Bad symbol type in call_macro ()"
 msgstr "ERREUR INTERNE: Mauvais type de symbole dans call_macro ()"
 
-#: src/macro.c:282
+#: src/macro.c:284
 #, c-format
 msgid "ERROR: Recursion limit of %d exceeded, use -L<N> to change it"
 msgstr "ERREUR: Limite de récursion %d dépassée, la changer par -L<N>"
 
+#: src/module.c:128
+#, c-format
+msgid "Error: cannot find module `%s'"
+msgstr ""
+
 #: src/output.c:198
 msgid "ERROR: Cannot create temporary file for diversion"
 msgstr "ERREUR: Incapable de créer un fichier temporaire pour la diversion"
diff --git a/po/it.gmo b/po/it.gmo
index 0b94806b..1312496f 100644
--- a/po/it.gmo
+++ b/po/it.gmo
diff --git a/po/it.po b/po/it.po
index 6f1a9cff..b3c0ba1e 100644
--- a/po/it.po
+++ b/po/it.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"POT-Creation-Date: 1998-10-04 01:31+0200\n"
+"POT-Creation-Date: 1998-10-07 17:46+0200\n"
 "Version: \n"
 "Date: 1995-06-30 21:00:12+0200\n"
 "From: Ulrich Drepper <drepper@myware>\n"
@@ -12,103 +12,103 @@ msgstr ""
 "Files: ../lib/regex.c ../lib/xmalloc.c\n"
 "Update on Fri Jun 30 21:00:27 MET 1995 \n"
 
-#: src/builtin.c:317
+#: src/builtin.c:328
 #, c-format
 msgid "Warning: Too few arguments to built-in `%s'"
 msgstr "Attenzione: Troppo pochi argomenti per la funzione predefinita `%s'"
 
-#: src/builtin.c:323
+#: src/builtin.c:334
 #, c-format
 msgid "Warning: Excess arguments to built-in `%s' ignored"
 msgstr ""
 "Attenzione: Gli argumenti in eccesso alla funzione predefinita `%s' sono "
 "ignorati"
 
-#: src/builtin.c:351
+#: src/builtin.c:362
 #, c-format
 msgid "Non-numeric argument to built-in `%s'"
 msgstr "Argumento non numerico a funzione predefinita `%s'"
 
-#: src/builtin.c:450
+#: src/builtin.c:461
 msgid "INTERNAL ERROR: Bad token data type in define_macro ()"
 msgstr "ERRORE INTERNO: Tipo dato `token' errato in define_macro ()"
 
-#: src/builtin.c:645 src/builtin.c:708 src/builtin.c:1331 src/builtin.c:1355
+#: src/builtin.c:656 src/builtin.c:719 src/builtin.c:1342 src/builtin.c:1366
 #, c-format
 msgid "Undefined name %s"
 msgstr "Nome `%s' non definito"
 
-#: src/builtin.c:673
+#: src/builtin.c:684
 msgid "INTERNAL ERROR: Builtin not found in builtin table!"
 msgstr ""
 
-#: src/builtin.c:681
+#: src/builtin.c:692
 msgid "INTERNAL ERROR: Bad token data type in m4_dumpdef ()"
 msgstr ""
 
-#: src/builtin.c:732
+#: src/builtin.c:743
 #, c-format
 msgid "Undefined macro `%s'"
 msgstr "Macro `%s' non definita"
 
-#: src/builtin.c:772
+#: src/builtin.c:783
 msgid "INTERNAL ERROR: Bad symbol type in m4_defn ()"
 msgstr "ERRORE INTERNO: Tipo simbolo errato in m4_defn ()"
 
-#: src/builtin.c:838
+#: src/builtin.c:849
 #, c-format
 msgid "Cannot open pipe to command `%s'"
 msgstr "Impossibile aprire una `pipe' per il comando `%s'"
 
-#: src/builtin.c:875
+#: src/builtin.c:886
 #, c-format
 msgid "Radix in eval out of range (radix = %d)"
 msgstr "Base fuori intervallo in `eval' (base = %d)"
 
-#: src/builtin.c:884
+#: src/builtin.c:895
 msgid "Negative width to eval"
 msgstr "Larghezza negativa in `eval'"
 
-#: src/builtin.c:976
+#: src/builtin.c:987
 #, c-format
 msgid "Non-numeric argument to %s"
 msgstr "Argumento non numerico a %s"
 
-#: src/builtin.c:988
+#: src/builtin.c:999
 #, c-format
 msgid "Cannot undivert %s"
 msgstr "Impossibile ripristinare la deviazione %s"
 
-#: src/builtin.c:1132
+#: src/builtin.c:1143
 #, fuzzy, c-format
 msgid "Undefined syntax code %c"
 msgstr "Nome `%s' non definito"
 
-#: src/builtin.c:1182 src/freeze.c:207
+#: src/builtin.c:1193 src/freeze.c:207
 #, c-format
 msgid "Cannot open %s"
 msgstr "Impossibile aprire %s"
 
-#: src/builtin.c:1391
+#: src/builtin.c:1402
 #, c-format
 msgid "Debugmode: bad debug flags: `%s'"
 msgstr "Modalità di debug: indicatori di debug errati: `%s'"
 
-#: src/builtin.c:1427
+#: src/builtin.c:1438
 #, c-format
 msgid "Cannot set error file: %s"
 msgstr "Impossibile aprire l' archivio di errore: %s"
 
-#: src/builtin.c:1644
+#: src/builtin.c:1655
 msgid "WARNING: \\0 will disappear, use \\& instead in replacements"
 msgstr ""
 
-#: src/builtin.c:1705 src/builtin.c:1765 src/input.c:979
+#: src/builtin.c:1716 src/builtin.c:1776 src/input.c:982
 #, c-format
 msgid "Bad regular expression `%s': %s"
 msgstr "Espressione regolare errata `%s': %s"
 
-#: src/builtin.c:1716 src/builtin.c:1789
+#: src/builtin.c:1727 src/builtin.c:1800
 #, c-format
 msgid "Error matching regular expression `%s'"
 msgstr "Errore nel confronto dell' espressione regolare `%s'"
@@ -197,37 +197,37 @@ msgstr "Fine prematura dell' archivio congelato"
 msgid "`%s' from frozen file not found in builtin table!"
 msgstr ""
 
-#: src/input.c:306
+#: src/input.c:309
 #, c-format
 msgid "Input reverted to %s, line %d"
 msgstr "Ingresso ripristinato su %s, linea %d"
 
-#: src/input.c:334
+#: src/input.c:337
 #, c-format
 msgid "Input read from %s"
 msgstr "Errore di lettura da %s"
 
-#: src/input.c:494
+#: src/input.c:497
 msgid "INTERNAL ERROR: Recursive push_string!"
 msgstr "ERRORE INTERNO: Utilizzo ricorsivo di push_string!"
 
-#: src/input.c:611
+#: src/input.c:614
 msgid "INTERNAL ERROR: Bad call to init_macro_token ()"
 msgstr "ERRORE INTERNO: Chiamata errata a init_macro_token ()"
 
-#: src/input.c:651
+#: src/input.c:654
 msgid "INTERNAL ERROR: Input stack botch in next_char ()"
 msgstr "ERRORE INTERNO: Stack di ingresso corrotto in next_char ()"
 
-#: src/input.c:688
+#: src/input.c:691
 msgid "INTERNAL ERROR: Input stack botch in peek_input ()"
 msgstr "ERRORE INTERNO: Stack di ingresso corrotto in peek_input ()"
 
-#: src/input.c:791
+#: src/input.c:794
 msgid "NONE"
 msgstr "NESSUNO"
 
-#: src/input.c:1130 src/input.c:1157
+#: src/input.c:1133 src/input.c:1160
 msgid "ERROR: EOF in string"
 msgstr "ERRORE: Fine prematura di una stringa"
 
@@ -332,27 +332,32 @@ msgstr "Indicatori di debug errati: `%s'"
 msgid "INTERNAL ERROR: Bad code in deferred arguments"
 msgstr "ERRORE INTERNO: Codice errato in argomenti differiti"
 
-#: src/macro.c:92
+#: src/macro.c:93
 msgid "INTERNAL ERROR: Bad token type in expand_token ()"
 msgstr "ERRORE INTERNO: Tipo `token' errato in expand_token ()"
 
-#: src/macro.c:158
+#: src/macro.c:159
 msgid "ERROR: EOF in argument list"
 msgstr "ERRORE: Fine prematura della lista di argomenti"
 
-#: src/macro.c:176
+#: src/macro.c:178
 msgid "INTERNAL ERROR: Bad token type in expand_argument ()"
 msgstr ""
 
-#: src/macro.c:253
+#: src/macro.c:255
 msgid "INTERNAL ERROR: Bad symbol type in call_macro ()"
 msgstr "ERRORE INTERNO: Tipo simbolo errato in call_macro ()"
 
-#: src/macro.c:282
+#: src/macro.c:284
 #, c-format
 msgid "ERROR: Recursion limit of %d exceeded, use -L<N> to change it"
 msgstr ""
 
+#: src/module.c:128
+#, c-format
+msgid "Error: cannot find module `%s'"
+msgstr ""
+
 #: src/output.c:198
 msgid "ERROR: Cannot create temporary file for diversion"
 msgstr "ERRORE: Impossibile creare un archivio temporaneo per la deviazione"
diff --git a/po/ja.gmo b/po/ja.gmo
index 65168671..15330c09 100644
--- a/po/ja.gmo
+++ b/po/ja.gmo
diff --git a/po/ja.po b/po/ja.po
index 77d8eb97..bcf4c14a 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GNU m4 1.4.3\n"
-"POT-Creation-Date: 1998-10-04 01:31+0200\n"
+"POT-Creation-Date: 1998-10-07 17:46+0200\n"
 "PO-Revision-Date: 1996-03-28 11:52 EST\n"
 "Last-Translator: Akiko Matsushita <matusita@sra.co.jp>\n"
 "Language-Team: Japanese <ja@li.org>\n"
@@ -13,101 +13,101 @@ msgstr ""
 "Content-Type: text/plain; charset=EUC\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: src/builtin.c:317
+#: src/builtin.c:328
 #, c-format
 msgid "Warning: Too few arguments to built-in `%s'"
 msgstr "·Ù¹ð¡§%s ¤Ø¤Î°ú¿ô¤¬ÉÔ­¤·¤Æ¤¤¤Þ¤¹¡£"
 
-#: src/builtin.c:323
+#: src/builtin.c:334
 #, c-format
 msgid "Warning: Excess arguments to built-in `%s' ignored"
 msgstr "·Ù¹ð¡§%s ¤Ø¤Î°ú¿ô¤¬Â¿²á¤®¤Þ¤¹ (Ķ¤¨¤¿Ê¬¤Ï̵»ë¤µ¤ì¤Þ¤¹)¡£"
 
-#: src/builtin.c:351
+#: src/builtin.c:362
 #, c-format
 msgid "Non-numeric argument to built-in `%s'"
 msgstr "`%s' ¤Ë¿ô»ú¤Ç¤Ê¤¤°ú¿ô¤¬ÅϤµ¤ì¤Æ¤¤¤Þ¤¹¡£"
 
-#: src/builtin.c:450
+#: src/builtin.c:461
 msgid "INTERNAL ERROR: Bad token data type in define_macro ()"
 msgstr "ÆâÉô¥¨¥é¡¼¡§´Ø¿ô define_macro () Æâ¤Î¥È¡¼¥¯¥ó¥Ç¡¼¥¿¤Î¼ïÎबÉÔÀµ¤Ç¤¹¡£"
 
-#: src/builtin.c:645 src/builtin.c:708 src/builtin.c:1331 src/builtin.c:1355
+#: src/builtin.c:656 src/builtin.c:719 src/builtin.c:1342 src/builtin.c:1366
 #, c-format
 msgid "Undefined name %s"
 msgstr "`%s' ¤ÏÄêµÁ¤µ¤ì¤Æ¤¤¤Þ¤»¤ó¡£"
 
-#: src/builtin.c:673
+#: src/builtin.c:684
 msgid "INTERNAL ERROR: Builtin not found in builtin table!"
 msgstr "ÆâÉô¥¨¥é¡¼¡§`Built-in' ¤È¤¤¤¦¥Ó¥ë¥È¥¤¥ó¥Þ¥¯¥í¤Ï¤¢¤ê¤Þ¤»¤ó¡£"
 
-#: src/builtin.c:681
+#: src/builtin.c:692
 msgid "INTERNAL ERROR: Bad token data type in m4_dumpdef ()"
 msgstr "ÆâÉô¥¨¥é¡¼¡§´Ø¿ô m4_dumpdef () ¤Î¥È¡¼¥¯¥ó¥Ç¡¼¥¿¤Î¼ïÎबÉÔÀµ¤Ç¤¹¡£"
 
-#: src/builtin.c:732
+#: src/builtin.c:743
 #, c-format
 msgid "Undefined macro `%s'"
 msgstr "¥Þ¥¯¥í `%s' ¤ÏÄêµÁ¤µ¤ì¤Æ¤¤¤Þ¤»¤ó¡£"
 
-#: src/builtin.c:772
+#: src/builtin.c:783
 msgid "INTERNAL ERROR: Bad symbol type in m4_defn ()"
 msgstr "ÆâÉô¥¨¥é¡¼¡§´Ø¿ô m4_defn () Æâ¤Î¥·¥ó¥Ü¥ë¤Î¼ïÎबÉÔÀµ¤Ç¤¹¡£"
 
-#: src/builtin.c:838
+#: src/builtin.c:849
 #, c-format
 msgid "Cannot open pipe to command `%s'"
 msgstr "¥³¥Þ¥ó¥É `%s' ¤Ø¤Î¥Ñ¥¤¥×¤¬¥ª¡¼¥×¥ó¤Ç¤­¤Þ¤»¤ó¡£"
 
-#: src/builtin.c:875
+#: src/builtin.c:886
 #, c-format
 msgid "Radix in eval out of range (radix = %d)"
 msgstr "eval ¤Î´ð¿ô ( %d ¿ÊË¡) ¤Î·å¿ô¤¬µöÍÆÈϰϳ°¤Ë¤¢¤ê¤Þ¤¹¡£"
 
-#: src/builtin.c:884
+#: src/builtin.c:895
 msgid "Negative width to eval"
 msgstr "eval ¤Î½ÐÎÏ·å¿ô¤¬Éé¿ô¤Ë¤Ê¤Ã¤Æ¤¤¤Þ¤¹¡£"
 
-#: src/builtin.c:976
+#: src/builtin.c:987
 #, c-format
 msgid "Non-numeric argument to %s"
 msgstr "`%s' ¤Ë¿ô»ú¤Ç¤Ê¤¤°ú¿ô¤¬ÅϤµ¤ì¤Æ¤¤¤Þ¤¹¡£"
 
-#: src/builtin.c:988
+#: src/builtin.c:999
 #, c-format
 msgid "Cannot undivert %s"
 msgstr "`%s' ¤ò undivert ¤Ç¤­¤Þ¤»¤ó¡£"
 
-#: src/builtin.c:1132
+#: src/builtin.c:1143
 #, fuzzy, c-format
 msgid "Undefined syntax code %c"
 msgstr "`%s' ¤ÏÄêµÁ¤µ¤ì¤Æ¤¤¤Þ¤»¤ó¡£"
 
-#: src/builtin.c:1182 src/freeze.c:207
+#: src/builtin.c:1193 src/freeze.c:207
 #, c-format
 msgid "Cannot open %s"
 msgstr "`%s' ¤ò¥ª¡¼¥×¥ó¤Ç¤­¤Þ¤»¤ó¡£"
 
-#: src/builtin.c:1391
+#: src/builtin.c:1402
 #, c-format
 msgid "Debugmode: bad debug flags: `%s'"
 msgstr "debugmode ¥Þ¥¯¥í¤Ë¤ª¤¤¤Æ %s ¤ÏÉÔÀµ¤Ê¥Ç¥Ð¥Ã¥°¥ª¥×¥·¥ç¥ó¤Ç¤¹¡£"
 
-#: src/builtin.c:1427
+#: src/builtin.c:1438
 #, c-format
 msgid "Cannot set error file: %s"
 msgstr "`%s' ¤ò¥¨¥é¡¼¥í¥°¥Õ¥¡¥¤¥ë¤È¤·¤Æ¥»¥Ã¥È¤Ç¤­¤Þ¤»¤ó¡£"
 
-#: src/builtin.c:1644
+#: src/builtin.c:1655
 msgid "WARNING: \\0 will disappear, use \\& instead in replacements"
 msgstr "·Ù¹ð¡§\\0 ¤Ïµì¼°¤ÎÍÑË¡¤Ç¤¹¡£\\& ¤òÂå¤ï¤ê¤Ë»È¤Ã¤Æ²¼¤µ¤¤¡£"
 
-#: src/builtin.c:1705 src/builtin.c:1765 src/input.c:979
+#: src/builtin.c:1716 src/builtin.c:1776 src/input.c:982
 #, c-format
 msgid "Bad regular expression `%s': %s"
 msgstr "`%s' : %s ¤Ï¡¢ÉÔÀµ¤ÊÀµµ¬É½¸½¤Ç¤¹¡£"
 
-#: src/builtin.c:1716 src/builtin.c:1789
+#: src/builtin.c:1727 src/builtin.c:1800
 #, c-format
 msgid "Error matching regular expression `%s'"
 msgstr "Àµµ¬É½¸½ %s ¤Î¥Þ¥Ã¥Á¥ó¥°¤Ë¼ºÇÔ¤·¤Þ¤·¤¿¡£"
@@ -203,37 +203,37 @@ msgstr "Åà·ë¥Õ¥¡¥¤¥ë¤Î EOF ¤¬Á᤯Íè²á¤®¤Æ¤¤¤Þ¤¹¡£"
 msgid "`%s' from frozen file not found in builtin table!"
 msgstr "Åà·ë¥Õ¥¡¥¤¥ë¤Î %s ¤Ï¥Ó¥ë¥È¥¤¥ó¥³¥Þ¥ó¥É¤Î¥Æ¡¼¥Ö¥ë¤Ë¤Ï¤¢¤ê¤Þ¤»¤ó¡£"
 
-#: src/input.c:306
+#: src/input.c:309
 #, c-format
 msgid "Input reverted to %s, line %d"
 msgstr "¥Õ¥¡¥¤¥ë %s, %d ¹ÔÌܤ«¤éÆþÎϤ·Ä¾¤·¤Þ¤¹¡£"
 
-#: src/input.c:334
+#: src/input.c:337
 #, c-format
 msgid "Input read from %s"
 msgstr "%s ¤«¤é¤ÎÆþÎϤòÆɤ߹þ¤ß¤Þ¤¹¡£"
 
-#: src/input.c:494
+#: src/input.c:497
 msgid "INTERNAL ERROR: Recursive push_string!"
 msgstr "ÆâÉô¥¨¥é¡¼¡§ºÆµ¢Åª¤Ëʸ»úÎó¤ò push ¤·¤Æ¤¤¤Þ¤¹¡£"
 
-#: src/input.c:611
+#: src/input.c:614
 msgid "INTERNAL ERROR: Bad call to init_macro_token ()"
 msgstr "ÆâÉô¥¨¥é¡¼¡§´Ø¿ô init_macro_token () ¤¬ÉÔÀµ¤Ë¸Æ¤Ð¤ì¤Æ¤¤¤Þ¤¹¡£"
 
-#: src/input.c:651
+#: src/input.c:654
 msgid "INTERNAL ERROR: Input stack botch in next_char ()"
 msgstr "ÆâÉô¥¨¥é¡¼¡§´Ø¿ô next_char () Æâ¤Ç¥¹¥¿¥Ã¥¯¤ÎÆþÎϤ˼ºÇÔ¤·¤Æ¤¤¤Þ¤¹¡£"
 
-#: src/input.c:688
+#: src/input.c:691
 msgid "INTERNAL ERROR: Input stack botch in peek_input ()"
 msgstr "ÆâÉô¥¨¥é¡¼¡§´Ø¿ô peek_input () Æâ¤Ç¥¹¥¿¥Ã¥¯¤ÎÆþÎϤ˼ºÇÔ¤·¤Æ¤¤¤Þ¤¹¡£"
 
-#: src/input.c:791
+#: src/input.c:794
 msgid "NONE"
 msgstr "¤Ê¤·"
 
-#: src/input.c:1130 src/input.c:1157
+#: src/input.c:1133 src/input.c:1160
 msgid "ERROR: EOF in string"
 msgstr "¥¨¥é¡¼: ʸ»úÎóÆâ¤Ë¥Õ¥¡¥¤¥ë¤Î½ªÃ¼µ­¹æ¤¬¤¢¤ê¤Þ¤¹¡£"
 
@@ -402,29 +402,34 @@ msgstr "`%s' ¤ÏÉÔÀµ¤Ê¥Ç¥Ð¥Ã¥°¥ª¥×¥·¥ç¥ó°ú¿ô¤Ç¤¹¡£"
 msgid "INTERNAL ERROR: Bad code in deferred arguments"
 msgstr "ÆâÉô¥¨¥é¡¼¡§¥ª¥×¥·¥ç¥ó¤Î¸å½èÍý¤Ç¡¢ÉÔÀµ¥³¡¼¥É¤¬¸¡½Ð¤µ¤ì¤Þ¤·¤¿¡£"
 
-#: src/macro.c:92
+#: src/macro.c:93
 msgid "INTERNAL ERROR: Bad token type in expand_token ()"
 msgstr "ÆâÉô¥¨¥é¡¼¡§´Ø¿ô expand_token () Æâ¤Î¥È¡¼¥¯¥ó¤Î¼ïÎबÉÔÀµ¤Ç¤¹¡£"
 
-#: src/macro.c:158
+#: src/macro.c:159
 msgid "ERROR: EOF in argument list"
 msgstr "¥¨¥é¡¼: °ú¿ô¥ê¥¹¥ÈÆâ¤Ë¥Õ¥¡¥¤¥ë¤Î½ªÃ¼µ­¹æ¤¬¤¢¤ê¤Þ¤¹¡£"
 
-#: src/macro.c:176
+#: src/macro.c:178
 msgid "INTERNAL ERROR: Bad token type in expand_argument ()"
 msgstr "ÆâÉô¥¨¥é¡¼¡§´Ø¿ô expand_argument () ¤Î¥È¡¼¥¯¥ó¤Î¼ïÎबÉÔÀµ¤Ç¤¹¡£"
 
-#: src/macro.c:253
+#: src/macro.c:255
 msgid "INTERNAL ERROR: Bad symbol type in call_macro ()"
 msgstr "ÆâÉô¥¨¥é¡¼¡§´Ø¿ô call_macro () Æâ¤Î¥·¥ó¥Ü¥ë¤Î¼ïÎबÉÔÀµ¤Ç¤¹¡£"
 
-#: src/macro.c:282
+#: src/macro.c:284
 #, c-format
 msgid "ERROR: Recursion limit of %d exceeded, use -L<N> to change it"
 msgstr ""
 "¥¨¥é¡¼¡§ºÆµ¢ÅªÄêµÁ¤Î¥Í¥¹¥È¤¬»ØÄꤵ¤ì¤¿ÃÍ %d ¤òĶ¤¨¤Æ¤¤¤Þ¤¹¡£\n"
 "        -L<¿ô»ú> ¥ª¥×¥·¥ç¥ó¤òÍѤ¤¤Æ¥Í¥¹¥È¿ô¤Î¾å¸Â¤òÁý¤ä¤·¤Æ²¼¤µ¤¤¡£"
 
+#: src/module.c:128
+#, c-format
+msgid "Error: cannot find module `%s'"
+msgstr ""
+
 #: src/output.c:198
 msgid "ERROR: Cannot create temporary file for diversion"
 msgstr "¥¨¥é¡¼: divert ¤Î¤¿¤á¤Î¥Æ¥ó¥Ý¥é¥ê¥Õ¥¡¥¤¥ë¤¬ºîÀ®¤Ç¤­¤Þ¤»¤ó¡£"
diff --git a/po/m4.pot b/po/m4.pot
index cf3ff601..a74fac99 100644
--- a/po/m4.pot
+++ b/po/m4.pot
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 1998-10-04 01:31+0200\n"
+"POT-Creation-Date: 1998-10-07 17:46+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -14,101 +14,101 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: ENCODING\n"
 
-#: src/builtin.c:317
+#: src/builtin.c:328
 #, c-format
 msgid "Warning: Too few arguments to built-in `%s'"
 msgstr ""
 
-#: src/builtin.c:323
+#: src/builtin.c:334
 #, c-format
 msgid "Warning: Excess arguments to built-in `%s' ignored"
 msgstr ""
 
-#: src/builtin.c:351
+#: src/builtin.c:362
 #, c-format
 msgid "Non-numeric argument to built-in `%s'"
 msgstr ""
 
-#: src/builtin.c:450
+#: src/builtin.c:461
 msgid "INTERNAL ERROR: Bad token data type in define_macro ()"
 msgstr ""
 
-#: src/builtin.c:645 src/builtin.c:708 src/builtin.c:1331 src/builtin.c:1355
+#: src/builtin.c:656 src/builtin.c:719 src/builtin.c:1342 src/builtin.c:1366
 #, c-format
 msgid "Undefined name %s"
 msgstr ""
 
-#: src/builtin.c:673
+#: src/builtin.c:684
 msgid "INTERNAL ERROR: Builtin not found in builtin table!"
 msgstr ""
 
-#: src/builtin.c:681
+#: src/builtin.c:692
 msgid "INTERNAL ERROR: Bad token data type in m4_dumpdef ()"
 msgstr ""
 
-#: src/builtin.c:732
+#: src/builtin.c:743
 #, c-format
 msgid "Undefined macro `%s'"
 msgstr ""
 
-#: src/builtin.c:772
+#: src/builtin.c:783
 msgid "INTERNAL ERROR: Bad symbol type in m4_defn ()"
 msgstr ""
 
-#: src/builtin.c:838
+#: src/builtin.c:849
 #, c-format
 msgid "Cannot open pipe to command `%s'"
 msgstr ""
 
-#: src/builtin.c:875
+#: src/builtin.c:886
 #, c-format
 msgid "Radix in eval out of range (radix = %d)"
 msgstr ""
 
-#: src/builtin.c:884
+#: src/builtin.c:895
 msgid "Negative width to eval"
 msgstr ""
 
-#: src/builtin.c:976
+#: src/builtin.c:987
 #, c-format
 msgid "Non-numeric argument to %s"
 msgstr ""
 
-#: src/builtin.c:988
+#: src/builtin.c:999
 #, c-format
 msgid "Cannot undivert %s"
 msgstr ""
 
-#: src/builtin.c:1132
+#: src/builtin.c:1143
 #, c-format
 msgid "Undefined syntax code %c"
 msgstr ""
 
-#: src/builtin.c:1182 src/freeze.c:207
+#: src/builtin.c:1193 src/freeze.c:207
 #, c-format
 msgid "Cannot open %s"
 msgstr ""
 
-#: src/builtin.c:1391
+#: src/builtin.c:1402
 #, c-format
 msgid "Debugmode: bad debug flags: `%s'"
 msgstr ""
 
-#: src/builtin.c:1427
+#: src/builtin.c:1438
 #, c-format
 msgid "Cannot set error file: %s"
 msgstr ""
 
-#: src/builtin.c:1644
+#: src/builtin.c:1655
 msgid "WARNING: \\0 will disappear, use \\& instead in replacements"
 msgstr ""
 
-#: src/builtin.c:1705 src/builtin.c:1765 src/input.c:979
+#: src/builtin.c:1716 src/builtin.c:1776 src/input.c:982
 #, c-format
 msgid "Bad regular expression `%s': %s"
 msgstr ""
 
-#: src/builtin.c:1716 src/builtin.c:1789
+#: src/builtin.c:1727 src/builtin.c:1800
 #, c-format
 msgid "Error matching regular expression `%s'"
 msgstr ""
@@ -197,37 +197,37 @@ msgstr ""
 msgid "`%s' from frozen file not found in builtin table!"
 msgstr ""
 
-#: src/input.c:306
+#: src/input.c:309
 #, c-format
 msgid "Input reverted to %s, line %d"
 msgstr ""
 
-#: src/input.c:334
+#: src/input.c:337
 #, c-format
 msgid "Input read from %s"
 msgstr ""
 
-#: src/input.c:494
+#: src/input.c:497
 msgid "INTERNAL ERROR: Recursive push_string!"
 msgstr ""
 
-#: src/input.c:611
+#: src/input.c:614
 msgid "INTERNAL ERROR: Bad call to init_macro_token ()"
 msgstr ""
 
-#: src/input.c:651
+#: src/input.c:654
 msgid "INTERNAL ERROR: Input stack botch in next_char ()"
 msgstr ""
 
-#: src/input.c:688
+#: src/input.c:691
 msgid "INTERNAL ERROR: Input stack botch in peek_input ()"
 msgstr ""
 
-#: src/input.c:791
+#: src/input.c:794
 msgid "NONE"
 msgstr ""
 
-#: src/input.c:1130 src/input.c:1157
+#: src/input.c:1133 src/input.c:1160
 msgid "ERROR: EOF in string"
 msgstr ""
 
@@ -332,27 +332,32 @@ msgstr ""
 msgid "INTERNAL ERROR: Bad code in deferred arguments"
 msgstr ""
 
-#: src/macro.c:92
+#: src/macro.c:93
 msgid "INTERNAL ERROR: Bad token type in expand_token ()"
 msgstr ""
 
-#: src/macro.c:158
+#: src/macro.c:159
 msgid "ERROR: EOF in argument list"
 msgstr ""
 
-#: src/macro.c:176
+#: src/macro.c:178
 msgid "INTERNAL ERROR: Bad token type in expand_argument ()"
 msgstr ""
 
-#: src/macro.c:253
+#: src/macro.c:255
 msgid "INTERNAL ERROR: Bad symbol type in call_macro ()"
 msgstr ""
 
-#: src/macro.c:282
+#: src/macro.c:284
 #, c-format
 msgid "ERROR: Recursion limit of %d exceeded, use -L<N> to change it"
 msgstr ""
 
+#: src/module.c:128
+#, c-format
+msgid "Error: cannot find module `%s'"
+msgstr ""
+
 #: src/output.c:198
 msgid "ERROR: Cannot create temporary file for diversion"
 msgstr ""
diff --git a/po/nl.gmo b/po/nl.gmo
index 51cabca8..798c1a27 100644
--- a/po/nl.gmo
+++ b/po/nl.gmo
diff --git a/po/nl.po b/po/nl.po
index 341b1dae..7ddd804f 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: m4 1.4d\n"
-"POT-Creation-Date: 1998-10-04 01:31+0200\n"
+"POT-Creation-Date: 1998-10-07 17:46+0200\n"
 "PO-Revision-Date: 1998-05-23 09:27+02:00\n"
 "Last-Translator: Erick Branderhorst <Erick.Branderhorst@asml.nl>\n"
 "Language-Team: dutch <nl@li.org>\n"
@@ -13,102 +13,102 @@ msgstr ""
 "Content-Type: text/plain; charset=\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: src/builtin.c:317
+#: src/builtin.c:328
 #, c-format
 msgid "Warning: Too few arguments to built-in `%s'"
 msgstr "Let op: Te weinig argument voor ingebouwde functie `%s'"
 
-#: src/builtin.c:323
+#: src/builtin.c:334
 #, c-format
 msgid "Warning: Excess arguments to built-in `%s' ignored"
 msgstr ""
 "Let op: Overbodige argumenten voor ingebouwde functie `%s' worden genegeerd"
 
-#: src/builtin.c:351
+#: src/builtin.c:362
 #, c-format
 msgid "Non-numeric argument to built-in `%s'"
 msgstr "Niet numeriek argument voor ingebouwde functie `%s'"
 
-#: src/builtin.c:450
+#: src/builtin.c:461
 msgid "INTERNAL ERROR: Bad token data type in define_macro ()"
 msgstr "INTERNE FOUT: Onjuist teken data type in define_macro ()"
 
-#: src/builtin.c:645 src/builtin.c:708 src/builtin.c:1331 src/builtin.c:1355
+#: src/builtin.c:656 src/builtin.c:719 src/builtin.c:1342 src/builtin.c:1366
 #, c-format
 msgid "Undefined name %s"
 msgstr "Ongedefinieerde naam %s"
 
-#: src/builtin.c:673
+#: src/builtin.c:684
 msgid "INTERNAL ERROR: Builtin not found in builtin table!"
 msgstr "INTERNE FOUT: Ingebouwde functie niet gevonden in functie tabel!"
 
-#: src/builtin.c:681
+#: src/builtin.c:692
 msgid "INTERNAL ERROR: Bad token data type in m4_dumpdef ()"
 msgstr "INTERNE FOUT: Onjuist teken data type in m4_dumpdef ()"
 
-#: src/builtin.c:732
+#: src/builtin.c:743
 #, c-format
 msgid "Undefined macro `%s'"
 msgstr "Ongedefinieerde macro `%s'"
 
-#: src/builtin.c:772
+#: src/builtin.c:783
 msgid "INTERNAL ERROR: Bad symbol type in m4_defn ()"
 msgstr "INTERNE FOUT: Onjuist symbool type in m4_defn ()"
 
-#: src/builtin.c:838
+#: src/builtin.c:849
 #, c-format
 msgid "Cannot open pipe to command `%s'"
 msgstr "Kan geen pijp openen voor commando `%s'"
 
-#: src/builtin.c:875
+#: src/builtin.c:886
 #, c-format
 msgid "Radix in eval out of range (radix = %d)"
 msgstr "Radix in evaluatie buiten bereik (radix = %d)"
 
-#: src/builtin.c:884
+#: src/builtin.c:895
 msgid "Negative width to eval"
 msgstr "Negatieve breedte te evalueren"
 
-#: src/builtin.c:976
+#: src/builtin.c:987
 #, c-format
 msgid "Non-numeric argument to %s"
 msgstr "Niet numeriek argument voor %s"
 
-#: src/builtin.c:988
+#: src/builtin.c:999
 #, c-format
 msgid "Cannot undivert %s"
 msgstr "Cannot undivert %s"
 
-#: src/builtin.c:1132
+#: src/builtin.c:1143
 #, c-format
 msgid "Undefined syntax code %c"
 msgstr "Ongedefinieerde syntax code %c"
 
-#: src/builtin.c:1182 src/freeze.c:207
+#: src/builtin.c:1193 src/freeze.c:207
 #, c-format
 msgid "Cannot open %s"
 msgstr "Kan %s niet openen"
 
-#: src/builtin.c:1391
+#: src/builtin.c:1402
 #, c-format
 msgid "Debugmode: bad debug flags: `%s'"
 msgstr "Debugmode: onjuiste debug vlaggen: `%s'"
 
-#: src/builtin.c:1427
+#: src/builtin.c:1438
 #, c-format
 msgid "Cannot set error file: %s"
 msgstr "Kan fout bestand niet instellen: %s"
 
-#: src/builtin.c:1644
+#: src/builtin.c:1655
 msgid "WARNING: \\0 will disappear, use \\& instead in replacements"
 msgstr "LET OP: \\0 zal verdwijnen, gebruik hiervoor \\& als vervanging"
 
-#: src/builtin.c:1705 src/builtin.c:1765 src/input.c:979
+#: src/builtin.c:1716 src/builtin.c:1776 src/input.c:982
 #, c-format
 msgid "Bad regular expression `%s': %s"
 msgstr "Onjuiste reguliere expressie `%s': %s"
 
-#: src/builtin.c:1716 src/builtin.c:1789
+#: src/builtin.c:1727 src/builtin.c:1800
 #, c-format
 msgid "Error matching regular expression `%s'"
 msgstr "Fout overeenkomen reguliere expressies `%s'"
@@ -199,37 +199,37 @@ msgstr "Voorbarig einde van gefixeerd bestand"
 msgid "`%s' from frozen file not found in builtin table!"
 msgstr "`%s' van gefixeerd bestand niet gevonden in functie tabel!"
 
-#: src/input.c:306
+#: src/input.c:309
 #, c-format
 msgid "Input reverted to %s, line %d"
 msgstr "Invoer reverted naar %s, lijn %d"
 
-#: src/input.c:334
+#: src/input.c:337
 #, c-format
 msgid "Input read from %s"
 msgstr "Invoer gelezen vanuit %s"
 
-#: src/input.c:494
+#: src/input.c:497
 msgid "INTERNAL ERROR: Recursive push_string!"
 msgstr "INTERNE FOUT: Recursieve push_string!"
 
-#: src/input.c:611
+#: src/input.c:614
 msgid "INTERNAL ERROR: Bad call to init_macro_token ()"
 msgstr "INTERNE FOUT: Onjuiste aanroep naar init_macro_token ()"
 
-#: src/input.c:651
+#: src/input.c:654
 msgid "INTERNAL ERROR: Input stack botch in next_char ()"
 msgstr "INTERNE FOUT: Invoer stapel botch in next_char ()"
 
-#: src/input.c:688
+#: src/input.c:691
 msgid "INTERNAL ERROR: Input stack botch in peek_input ()"
 msgstr "INTERNE FOUT: Invoer stapel botch in peek_input ()"
 
-#: src/input.c:791
+#: src/input.c:794
 msgid "NONE"
 msgstr "GEEN"
 
-#: src/input.c:1130 src/input.c:1157
+#: src/input.c:1133 src/input.c:1160
 msgid "ERROR: EOF in string"
 msgstr "FOUT: Einde van bestand teken in string"
 
@@ -388,28 +388,33 @@ msgstr "Onjuiste debug vlaggen: `%s'"
 msgid "INTERNAL ERROR: Bad code in deferred arguments"
 msgstr "INTERNE FOUT: Onjuiste code in afgeleide argumenten"
 
-#: src/macro.c:92
+#: src/macro.c:93
 msgid "INTERNAL ERROR: Bad token type in expand_token ()"
 msgstr "INTERNE FOUT: Onjuist teken type in expand_token ()"
 
-#: src/macro.c:158
+#: src/macro.c:159
 msgid "ERROR: EOF in argument list"
 msgstr "FOUT: Einde van bestand teken in argumentenlijst"
 
-#: src/macro.c:176
+#: src/macro.c:178
 msgid "INTERNAL ERROR: Bad token type in expand_argument ()"
 msgstr "INTERNE FOUT: Onjuist teken type in expand_argument ()"
 
-#: src/macro.c:253
+#: src/macro.c:255
 msgid "INTERNAL ERROR: Bad symbol type in call_macro ()"
 msgstr "INTERNE FOUT: Onjuist symbool type in call_macro ()"
 
-#: src/macro.c:282
+#: src/macro.c:284
 #, c-format
 msgid "ERROR: Recursion limit of %d exceeded, use -L<N> to change it"
 msgstr ""
 "FOUT: Recursie limiet of %d overschreden, gebruik -L<N> om dit te wijzigen"
 
+#: src/module.c:128
+#, c-format
+msgid "Error: cannot find module `%s'"
+msgstr ""
+
 #: src/output.c:198
 msgid "ERROR: Cannot create temporary file for diversion"
 msgstr "FOUT: Kan geen tijdelijk bestand aanmaken voor diversion"
diff --git a/po/pl.gmo b/po/pl.gmo
index 4bb38992..1518dcd5 100644
--- a/po/pl.gmo
+++ b/po/pl.gmo
diff --git a/po/pl.po b/po/pl.po
index 8cdf9481..c80fc914 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: m4 1.4.3\n"
-"POT-Creation-Date: 1998-10-04 01:31+0200\n"
+"POT-Creation-Date: 1998-10-07 17:46+0200\n"
 "PO-Revision-Date: 1998-08-05 17:30+0200\n"
 "Last-Translator: Rafa³ Maszkowski <rzm@icm.edu.pl>\n"
 "Language-Team: Polish <pl@li.org>\n"
@@ -13,101 +13,101 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: src/builtin.c:317
+#: src/builtin.c:328
 #, c-format
 msgid "Warning: Too few arguments to built-in `%s'"
 msgstr "Uwaga: Za ma³o argumentów dla wbodowanego `%s'"
 
-#: src/builtin.c:323
+#: src/builtin.c:334
 #, c-format
 msgid "Warning: Excess arguments to built-in `%s' ignored"
 msgstr "Uwaga: Nadmiarowe argumenty do built-in `%s' zosta³y zignorowane"
 
-#: src/builtin.c:351
+#: src/builtin.c:362
 #, c-format
 msgid "Non-numeric argument to built-in `%s'"
 msgstr "Nienumeryczny argument do built-in `%s'"
 
-#: src/builtin.c:450
+#: src/builtin.c:461
 msgid "INTERNAL ERROR: Bad token data type in define_macro ()"
 msgstr "B£¡D WEWNÊTRZNY: Z³y typ danych tokenu w define_macro ()"
 
-#: src/builtin.c:645 src/builtin.c:708 src/builtin.c:1331 src/builtin.c:1355
+#: src/builtin.c:656 src/builtin.c:719 src/builtin.c:1342 src/builtin.c:1366
 #, c-format
 msgid "Undefined name %s"
 msgstr "Niezdefiniowana nazwa %s"
 
-#: src/builtin.c:673
+#: src/builtin.c:684
 msgid "INTERNAL ERROR: Builtin not found in builtin table!"
 msgstr "B£¡D WEWNÊTRZNY: Wbudowane nie znalezione w tablicy wbudowanych!"
 
-#: src/builtin.c:681
+#: src/builtin.c:692
 msgid "INTERNAL ERROR: Bad token data type in m4_dumpdef ()"
 msgstr "B£¡D WEWNÊTRZNY: Z³y typ danych tokenu w m4_dumpref ()"
 
-#: src/builtin.c:732
+#: src/builtin.c:743
 #, c-format
 msgid "Undefined macro `%s'"
 msgstr "Niezdefiniowane makro `%s'"
 
-#: src/builtin.c:772
+#: src/builtin.c:783
 msgid "INTERNAL ERROR: Bad symbol type in m4_defn ()"
 msgstr "B£¡D WEWNETRZNY: Z³y typ symbolu w m4_defn ()"
 
-#: src/builtin.c:838
+#: src/builtin.c:849
 #, c-format
 msgid "Cannot open pipe to command `%s'"
 msgstr "Nie mogê otworzyæ potoku do komendy `%s'"
 
-#: src/builtin.c:875
+#: src/builtin.c:886
 #, c-format
 msgid "Radix in eval out of range (radix = %d)"
 msgstr "Baza w eval poza zakresem (radix = %d)"
 
-#: src/builtin.c:884
+#: src/builtin.c:895
 msgid "Negative width to eval"
 msgstr "Ujemna d³ugo¶æ w eval"
 
-#: src/builtin.c:976
+#: src/builtin.c:987
 #, c-format
 msgid "Non-numeric argument to %s"
 msgstr "Nienumeryczny argument dla %s"
 
-#: src/builtin.c:988
+#: src/builtin.c:999
 #, c-format
 msgid "Cannot undivert %s"
 msgstr "Nie mogê przetowrzyæ z powrotem %s"
 
-#: src/builtin.c:1132
+#: src/builtin.c:1143
 #, fuzzy, c-format
 msgid "Undefined syntax code %c"
 msgstr "Niezdefiniowana nazwa %s"
 
-#: src/builtin.c:1182 src/freeze.c:207
+#: src/builtin.c:1193 src/freeze.c:207
 #, c-format
 msgid "Cannot open %s"
 msgstr "Nie mogê otworzyæ %s"
 
-#: src/builtin.c:1391
+#: src/builtin.c:1402
 #, c-format
 msgid "Debugmode: bad debug flags: `%s'"
 msgstr "Tryb debugowania: z³e flagi debugowania: `%s'"
 
-#: src/builtin.c:1427
+#: src/builtin.c:1438
 #, c-format
 msgid "Cannot set error file: %s"
 msgstr "Nie mogê ustawiæ pliku b³êdów: %s"
 
-#: src/builtin.c:1644
+#: src/builtin.c:1655
 msgid "WARNING: \\0 will disappear, use \\& instead in replacements"
 msgstr "UWAGA: \\0 zniknie, w podstawieniach u¿yj zamiast tego \\&"
 
-#: src/builtin.c:1705 src/builtin.c:1765 src/input.c:979
+#: src/builtin.c:1716 src/builtin.c:1776 src/input.c:982
 #, c-format
 msgid "Bad regular expression `%s': %s"
 msgstr "B³êdne wyra¿enie regularne `%s': %s"
 
-#: src/builtin.c:1716 src/builtin.c:1789
+#: src/builtin.c:1727 src/builtin.c:1800
 #, c-format
 msgid "Error matching regular expression `%s'"
 msgstr "B³±d dopasowania do wyra¿enia regularnego `%s'"
@@ -198,37 +198,37 @@ msgstr "Przedwczesny koniec pliku zamro¿onego"
 msgid "`%s' from frozen file not found in builtin table!"
 msgstr "`%s' z pliku zamro¿onego nie znalezione w tablicy wbudowanych!"
 
-#: src/input.c:306
+#: src/input.c:309
 #, c-format
 msgid "Input reverted to %s, line %d"
 msgstr "Dane wej¶ciowe wycofane do %s, linia %d"
 
-#: src/input.c:334
+#: src/input.c:337
 #, c-format
 msgid "Input read from %s"
 msgstr "Dane wej¶ciowe przeczytane z %s"
 
-#: src/input.c:494
+#: src/input.c:497
 msgid "INTERNAL ERROR: Recursive push_string!"
 msgstr "B£¡D WEWNÊTRZNY: Rekursywny push_string!"
 
-#: src/input.c:611
+#: src/input.c:614
 msgid "INTERNAL ERROR: Bad call to init_macro_token ()"
 msgstr "B£¡D WEWNÊTRZNY: B³êdne wywo³anie init_macro_token ()"
 
-#: src/input.c:651
+#: src/input.c:654
 msgid "INTERNAL ERROR: Input stack botch in next_char ()"
 msgstr "B£¡D WEWNÊTRZNY: B³±d stosu wej¶ciowego w next_char ()"
 
-#: src/input.c:688
+#: src/input.c:691
 msgid "INTERNAL ERROR: Input stack botch in peek_input ()"
 msgstr "B£¡D WEWNÊTRZNY: B³±d stosu wej¶ciowego w peek_input ()"
 
-#: src/input.c:791
+#: src/input.c:794
 msgid "NONE"
 msgstr "¯ADEN"
 
-#: src/input.c:1130 src/input.c:1157
+#: src/input.c:1133 src/input.c:1160
 msgid "ERROR: EOF in string"
 msgstr "B£¡D: EOF w ³añcuchu"
 
@@ -382,27 +382,32 @@ msgstr "B³êdne flagi debugowania: `%s'"
 msgid "INTERNAL ERROR: Bad code in deferred arguments"
 msgstr "B£¡D WEWNÊTRZNY: B³êdny kod w od³o¿onych argumentach"
 
-#: src/macro.c:92
+#: src/macro.c:93
 msgid "INTERNAL ERROR: Bad token type in expand_token ()"
 msgstr "B£¡D WEWNÊTRZNY: B³êdny typ tokena w expand_token ()"
 
-#: src/macro.c:158
+#: src/macro.c:159
 msgid "ERROR: EOF in argument list"
 msgstr "B£¡D: EOF w li¶cie argumentów"
 
-#: src/macro.c:176
+#: src/macro.c:178
 msgid "INTERNAL ERROR: Bad token type in expand_argument ()"
 msgstr "B£¡D WEWNÊTRZNY: B³êdny typ tokena w expand_argument ()"
 
-#: src/macro.c:253
+#: src/macro.c:255
 msgid "INTERNAL ERROR: Bad symbol type in call_macro ()"
 msgstr "B£¡D WEWNÊTRZNY: B³êdny symbol w call_macro ()"
 
-#: src/macro.c:282
+#: src/macro.c:284
 #, c-format
 msgid "ERROR: Recursion limit of %d exceeded, use -L<N> to change it"
 msgstr "B£¡D: Osi±gniêty limit rekursji %d, u¿yj -L<N> ¿eby go zmieniæ"
 
+#: src/module.c:128
+#, c-format
+msgid "Error: cannot find module `%s'"
+msgstr ""
+
 #: src/output.c:198
 msgid "ERROR: Cannot create temporary file for diversion"
 msgstr "B£¡D: Nie mogê utworzyæ plików tymczasowych dla przetwarzania"
diff --git a/po/ru.gmo b/po/ru.gmo
index ee17d932..417e2f86 100644
--- a/po/ru.gmo
+++ b/po/ru.gmo
diff --git a/po/ru.po b/po/ru.po
index 3c112932..6a17a808 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: m4 1.4.3\n"
-"POT-Creation-Date: 1998-10-04 01:31+0200\n"
+"POT-Creation-Date: 1998-10-07 17:46+0200\n"
 "PO-Revision-Date: 1997-07-12 20:58\n"
 "Last-Translator: Denis Y. Pershin <dyp@siblug.org>\n"
 "Language-Team: Russian <ru@li.org>\n"
@@ -12,103 +12,103 @@ msgstr ""
 "Content-Type: text/plain; charset=koi8-r\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: src/builtin.c:317
+#: src/builtin.c:328
 #, c-format
 msgid "Warning: Too few arguments to built-in `%s'"
 msgstr "ðÒÅÄÕÐÒÅÖÄÅÎÉÅ: óÌÉÛËÏÍ ÍÁÌÏ ÁÒÇÕÍÅÎÔÏ× ÄÌÑ ×ÓÔÒÏÅÎÎÏÊ ÌÅËÓÅÍÙ '%s'"
 
-#: src/builtin.c:323
+#: src/builtin.c:334
 #, c-format
 msgid "Warning: Excess arguments to built-in `%s' ignored"
 msgstr ""
 "ðÒÅÄÕÐÒÅÖÄÅÎÉÅ: éÚÂÙÔÏÞÎÙÅ ÁÒÇÕÍÅÎÔÙ ÄÌÑ ×ÓÔÒÏÅÎÎÏÊ ÌÅËÓÅÍÙ '%s' "
 "ÐÒÏÉÇÎÏÒÉÒÏ×ÁÎÙ"
 
-#: src/builtin.c:351
+#: src/builtin.c:362
 #, c-format
 msgid "Non-numeric argument to built-in `%s'"
 msgstr "îÅ ÞÉÓÌÏ×ÏÊ ÁÒÇÕÍÅÎÔ ÄÌÑ ×ÓÔÒÏÅÎÎÏÊ ÌÅËÓÅÍÙ '%s'"
 
-#: src/builtin.c:450
+#: src/builtin.c:461
 msgid "INTERNAL ERROR: Bad token data type in define_macro ()"
 msgstr "÷îõôòåîîññ ïûéâëá: îÅ×ÅÒÎÙÊ ÔÉÐ ÌÅËÓÅÍÙ × define_macro ()"
 
-#: src/builtin.c:645 src/builtin.c:708 src/builtin.c:1331 src/builtin.c:1355
+#: src/builtin.c:656 src/builtin.c:719 src/builtin.c:1342 src/builtin.c:1366
 #, c-format
 msgid "Undefined name %s"
 msgstr "éÍÑ %s ÎÅÏÐÒÅÄÅÌÅÎÏ"
 
-#: src/builtin.c:673
+#: src/builtin.c:684
 msgid "INTERNAL ERROR: Builtin not found in builtin table!"
 msgstr "÷îõôòåîîññ ïûéâëá: ÷ÓÔÒÏÅÎÎÁÑ ÌÅËÓÅÍÁ ÎÅ ÎÁÊÄÅÎÁ!"
 
-#: src/builtin.c:681
+#: src/builtin.c:692
 msgid "INTERNAL ERROR: Bad token data type in m4_dumpdef ()"
 msgstr "÷îõôòåîîññ ïûéâëá: îÅ×ÅÒÎÙÊ ÔÉÐ ÌÅËÓÅÍÙ × m4_dumpdef ()"
 
-#: src/builtin.c:732
+#: src/builtin.c:743
 #, c-format
 msgid "Undefined macro `%s'"
 msgstr "îÅÏÐÒÅÄÅÌÅÎÎÙÊ ÍÁËÒÏÓ '%s'"
 
-#: src/builtin.c:772
+#: src/builtin.c:783
 msgid "INTERNAL ERROR: Bad symbol type in m4_defn ()"
 msgstr "÷îõôòåîîññ ïûéâëá: îÅ×ÅÒÎÙÊ ÔÉÐ ÓÉÍ×ÏÌÁ × m4_defn ()"
 
-#: src/builtin.c:838
+#: src/builtin.c:849
 #, c-format
 msgid "Cannot open pipe to command `%s'"
 msgstr "îÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ËÁÎÁÌ ÄÌÑ ËÏÍÍÁÎÄÙ '%s'"
 
-#: src/builtin.c:875
+#: src/builtin.c:886
 #, c-format
 msgid "Radix in eval out of range (radix = %d)"
 msgstr "òÁÄÉËÓ × ×ÙÒÁÖÅÎÉÉ ×ÙÈÏÄÉÔ ÚÁ ÐÒÅÄÅÌÙ (radix = %d)"
 
-#: src/builtin.c:884
+#: src/builtin.c:895
 msgid "Negative width to eval"
 msgstr "ïÔÒÉÃÁÔÅÌØÎÁÑ ÛÉÒÉÎÁ"
 
-#: src/builtin.c:976
+#: src/builtin.c:987
 #, c-format
 msgid "Non-numeric argument to %s"
 msgstr "îÅ ÞÉÓÌÏ×ÏÊ ÁÒÇÕÍÅÎÔ ÄÌÑ %s"
 
-#: src/builtin.c:988
+#: src/builtin.c:999
 #, c-format
 msgid "Cannot undivert %s"
 msgstr "îÅ×ÏÚÍÏÖÎÏ ×ÅÒÎÕÔØ ×Ù×ÏÄ ÉÚ %s"
 
-#: src/builtin.c:1132
+#: src/builtin.c:1143
 #, fuzzy, c-format
 msgid "Undefined syntax code %c"
 msgstr "éÍÑ %s ÎÅÏÐÒÅÄÅÌÅÎÏ"
 
-#: src/builtin.c:1182 src/freeze.c:207
+#: src/builtin.c:1193 src/freeze.c:207
 #, c-format
 msgid "Cannot open %s"
 msgstr "îÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ %s"
 
-#: src/builtin.c:1391
+#: src/builtin.c:1402
 #, c-format
 msgid "Debugmode: bad debug flags: `%s'"
 msgstr "òÅÖÉÍ ÏÔÌÁÄËÉ: ÎÅ×ÅÒÎÙÊ ÆÌÁÇ ÏÔÌÁÄËÉ: '%s'"
 
-#: src/builtin.c:1427
+#: src/builtin.c:1438
 #, c-format
 msgid "Cannot set error file: %s"
 msgstr "îÅ×ÏÚÍÏÖÎÏ ÎÁÚÎÁÞÉÔØ ÆÁÊÌ ÏÛÉÂÏË %s"
 
-#: src/builtin.c:1644
+#: src/builtin.c:1655
 msgid "WARNING: \\0 will disappear, use \\& instead in replacements"
 msgstr "ðòåäõðòåöäåîéå: \\0 ÉÓÞÅÚÎÅÔ, ÉÓÐÏÌØÚÕÊÔÅ \\& × ÚÁÍÅÎÁÈ"
 
-#: src/builtin.c:1705 src/builtin.c:1765 src/input.c:979
+#: src/builtin.c:1716 src/builtin.c:1776 src/input.c:982
 #, c-format
 msgid "Bad regular expression `%s': %s"
 msgstr "îÅ×ÅÒÎÏÅ ÒÅÇÕÌÑÒÎÏÅ ×ÙÒÁÖÅÎÉÅ: '%s': %s"
 
-#: src/builtin.c:1716 src/builtin.c:1789
+#: src/builtin.c:1727 src/builtin.c:1800
 #, c-format
 msgid "Error matching regular expression `%s'"
 msgstr "ïÛÉÂËÁ ÓÏÐÏÓÔÁ×ÌÅÎÉÑ ÒÅÇÕÌÑÒÎÏÇÏ ×ÙÒÁÖÅÎÉÑ '%s'"
@@ -197,37 +197,37 @@ msgstr "ðÒÅÖÄÅ×ÒÅÍÅÎÎÙÊ ËÏÎÅà ÆÁÊÌÁ-ÏÂÒÁÚÁ ÐÁÍÑÔÉ"
 msgid "`%s' from frozen file not found in builtin table!"
 msgstr "'%s' ÉÚ ÆÁÊÌÁ-ÏÂÒÁÚÁ ÐÁÍÑÔÉ ÎÅ ÎÁÊÄÅÎÁ ×Ï ×ÓÔÒÏÅÎÎÏÊ ÔÁÂÌÉÃÅ!"
 
-#: src/input.c:306
+#: src/input.c:309
 #, c-format
 msgid "Input reverted to %s, line %d"
 msgstr "÷×ÏÄ ÐÅÒÅÎÁÐÒÁ×ÌÅÎ × %s , ÓÔÒÏËÁ %d"
 
-#: src/input.c:334
+#: src/input.c:337
 #, c-format
 msgid "Input read from %s"
 msgstr "÷×ÏÄ ÉÚ %s"
 
-#: src/input.c:494
+#: src/input.c:497
 msgid "INTERNAL ERROR: Recursive push_string!"
 msgstr "÷îõôòåîîññ ïûéâëá: òÅËÕÒÓÉ×ÎÁÑ push_string!"
 
-#: src/input.c:611
+#: src/input.c:614
 msgid "INTERNAL ERROR: Bad call to init_macro_token ()"
 msgstr "÷îõôòåîîññ ïûéâëá: îÅ×ÅÒÎÙÊ ×ÙÚÏ× init_macro_token ()"
 
-#: src/input.c:651
+#: src/input.c:654
 msgid "INTERNAL ERROR: Input stack botch in next_char ()"
 msgstr "÷îõôòåîîññ ïûéâëá: ïÛÉÂËÁ ×ÈÏÄÎÏÇÏ ÓÔÅËÁ × next_char ()"
 
-#: src/input.c:688
+#: src/input.c:691
 msgid "INTERNAL ERROR: Input stack botch in peek_input ()"
 msgstr "÷îõôòåîîññ ïûéâëá: ïÛÉÂËÁ ×ÈÏÄÎÏÇÏ ÓÔÅËÁ × peek_input ()"
 
-#: src/input.c:791
+#: src/input.c:794
 msgid "NONE"
 msgstr "îéþåçï"
 
-#: src/input.c:1130 src/input.c:1157
+#: src/input.c:1133 src/input.c:1160
 msgid "ERROR: EOF in string"
 msgstr "ïûéâëá: ëÏÎÅà ÆÁÊÌÁ × ÓÔÒÏËÅ"
 
@@ -389,28 +389,33 @@ msgstr "îÅ×ÅÒÎÙÊ ÆÌÁÇ ÏÔÌÁÄËÉ: '%s'"
 msgid "INTERNAL ERROR: Bad code in deferred arguments"
 msgstr "÷îõôòåîîññ ïûéâëá: îÅ×ÅÒÎÙÊ ËÏÄ × ËÏÓ×ÅÎÎÙÈ ÁÒÇÕÍÅÎÔÁÈ"
 
-#: src/macro.c:92
+#: src/macro.c:93
 msgid "INTERNAL ERROR: Bad token type in expand_token ()"
 msgstr "÷îõôòåîîññ ïûéâëá: îÅ×ÅÒÎÙÊ ÔÉÐ ÌÅËÓÅÍÙ × expand_token ()"
 
-#: src/macro.c:158
+#: src/macro.c:159
 msgid "ERROR: EOF in argument list"
 msgstr "ïûéâëá: ëÏÎÅà ÆÁÊÌÁ × ÓÐÉÓËÅ ÁÒÇÕÍÅÎÔÏ×"
 
-#: src/macro.c:176
+#: src/macro.c:178
 msgid "INTERNAL ERROR: Bad token type in expand_argument ()"
 msgstr "÷îõôòåîîññ ïûéâëá: îÅ×ÅÒÎÙÊ ÔÉÐ ÌÅËÓÅÍÙ × expand_argument ()"
 
-#: src/macro.c:253
+#: src/macro.c:255
 msgid "INTERNAL ERROR: Bad symbol type in call_macro ()"
 msgstr "÷îõôòåîîññ ïûéâëá: îÅ×ÅÒÎÙÊ ÔÉÐ ÓÉÍ×ÏÌÁ × call_macro ()"
 
-#: src/macro.c:282
+#: src/macro.c:284
 #, c-format
 msgid "ERROR: Recursion limit of %d exceeded, use -L<N> to change it"
 msgstr ""
 "ïûéâëá: ìÉÍÉÔ ÒÅËÕÒÓÉÉ %d ÉÓÞÅÒÐÁÎ, ÉÓÐÏÌØÚÕÊÔÅ -L<N> ÞÔÏÂÙ ÉÚÍÅÎÉÔØ ÅÇÏ"
 
+#: src/module.c:128
+#, c-format
+msgid "Error: cannot find module `%s'"
+msgstr ""
+
 #: src/output.c:198
 msgid "ERROR: Cannot create temporary file for diversion"
 msgstr "ïûéâëá: îÅ ÍÏÇÕ ÓÏÚÄÁÔØ ×ÒÅÍÅÎÎÙÊ ÆÁÊÌ ÄÌÑ ÒÁÚ×ÅÔ×ÌÅÎÉÑ ÍÁËÒÏÏÂÒÁÂÏÔËÉ"
diff --git a/po/sv.gmo b/po/sv.gmo
index 3c1d55ef..19a23232 100644
--- a/po/sv.gmo
+++ b/po/sv.gmo
diff --git a/po/sv.po b/po/sv.po
index a345037b..35972030 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -1,120 +1,120 @@
 # Swedish messages for m4
 # Copyright (C) 1996 Free Software Foundation, Inc.
 # <Jan.Djarv@mbox200.swipnet.se>, 1996.
-# $Revision: 1.1.1.4 $
+# $Revision: 1.1.1.5 $
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: m4 1.4.3\n"
-"POT-Creation-Date: 1998-10-04 01:31+0200\n"
-"PO-Revision-Date: $Date: 2000/02/17 03:09:09 $\n"
+"POT-Creation-Date: 1998-10-07 17:46+0200\n"
+"PO-Revision-Date: $Date: 2000/02/17 03:09:35 $\n"
 "Last-Translator: Jan Djärv <Jan.Djarv@mbox200.swipnet.se>\n"
 "Language-Team: Swedish <sv@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: src/builtin.c:317
+#: src/builtin.c:328
 #, fuzzy, c-format
 msgid "Warning: Too few arguments to built-in `%s'"
 msgstr "Varning: För få argument till inbyggt makro \"%s\""
 
-#: src/builtin.c:323
+#: src/builtin.c:334
 #, fuzzy, c-format
 msgid "Warning: Excess arguments to built-in `%s' ignored"
 msgstr "Varning: Överskottsargument till inbyggt makro \"%s\" ignorerade"
 
-#: src/builtin.c:351
+#: src/builtin.c:362
 #, fuzzy, c-format
 msgid "Non-numeric argument to built-in `%s'"
 msgstr "Ickenumeriskt argument till inbyggt makro \"%s\""
 
-#: src/builtin.c:450
+#: src/builtin.c:461
 #, fuzzy
 msgid "INTERNAL ERROR: Bad token data type in define_macro ()"
 msgstr "INTERNT FEL: Otillåten lexikalisk datatyp i define_macro ()"
 
-#: src/builtin.c:645 src/builtin.c:708 src/builtin.c:1331 src/builtin.c:1355
+#: src/builtin.c:656 src/builtin.c:719 src/builtin.c:1342 src/builtin.c:1366
 #, fuzzy, c-format
 msgid "Undefined name %s"
 msgstr "Odefinierat namn \"%s\""
 
-#: src/builtin.c:673
+#: src/builtin.c:684
 #, fuzzy
 msgid "INTERNAL ERROR: Builtin not found in builtin table!"
 msgstr "INTERNT FEL: Inbyggt makro finns inte i tabellen!"
 
-#: src/builtin.c:681
+#: src/builtin.c:692
 #, fuzzy
 msgid "INTERNAL ERROR: Bad token data type in m4_dumpdef ()"
 msgstr "INTERNT FEL: Otillåten lexikalisk datatyp i m4_dumpdef ()"
 
-#: src/builtin.c:732
+#: src/builtin.c:743
 #, fuzzy, c-format
 msgid "Undefined macro `%s'"
 msgstr "Odefinierat makro \"%s\""
 
-#: src/builtin.c:772
+#: src/builtin.c:783
 #, fuzzy
 msgid "INTERNAL ERROR: Bad symbol type in m4_defn ()"
 msgstr "INTERNT FEL: Otillåten symboltyp i m4_defn ()"
 
-#: src/builtin.c:838
+#: src/builtin.c:849
 #, fuzzy, c-format
 msgid "Cannot open pipe to command `%s'"
 msgstr "Kan inte skapa rör till kommandot \"%s\""
 
-#: src/builtin.c:875
+#: src/builtin.c:886
 #, fuzzy, c-format
 msgid "Radix in eval out of range (radix = %d)"
 msgstr "Otillåten bas i \"eval\" (bas = %d)"
 
-#: src/builtin.c:884
+#: src/builtin.c:895
 #, fuzzy
 msgid "Negative width to eval"
 msgstr "Negativ bredd till \"eval\""
 
-#: src/builtin.c:976
+#: src/builtin.c:987
 #, fuzzy, c-format
 msgid "Non-numeric argument to %s"
 msgstr "Ickenumeriskt argument till %s"
 
-#: src/builtin.c:988
+#: src/builtin.c:999
 #, fuzzy, c-format
 msgid "Cannot undivert %s"
 msgstr "Kan inte återleda %s"
 
-#: src/builtin.c:1132
+#: src/builtin.c:1143
 #, fuzzy, c-format
 msgid "Undefined syntax code %c"
 msgstr "Odefinierat namn \"%s\""
 
-#: src/builtin.c:1182 src/freeze.c:207
+#: src/builtin.c:1193 src/freeze.c:207
 #, fuzzy, c-format
 msgid "Cannot open %s"
 msgstr "Kan inte öppna %s"
 
-#: src/builtin.c:1391
+#: src/builtin.c:1402
 #, fuzzy, c-format
 msgid "Debugmode: bad debug flags: `%s'"
 msgstr "Felsökningsläge: okänd flagga: \"%s\""
 
-#: src/builtin.c:1427
+#: src/builtin.c:1438
 #, fuzzy, c-format
 msgid "Cannot set error file: %s"
 msgstr "Kan inte sätta felutskriftsfil: %s"
 
-#: src/builtin.c:1644
+#: src/builtin.c:1655
 #, fuzzy
 msgid "WARNING: \\0 will disappear, use \\& instead in replacements"
 msgstr "VARNING: \\0 kommer att försvinna, använd \\& i ersättningar"
 
-#: src/builtin.c:1705 src/builtin.c:1765 src/input.c:979
+#: src/builtin.c:1716 src/builtin.c:1776 src/input.c:982
 #, fuzzy, c-format
 msgid "Bad regular expression `%s': %s"
 msgstr "Otillåtet reguljäruttryck \"%s\": %s"
 
-#: src/builtin.c:1716 src/builtin.c:1789
+#: src/builtin.c:1727 src/builtin.c:1800
 #, fuzzy, c-format
 msgid "Error matching regular expression `%s'"
 msgstr "Reguljäruttrycket \"%s\" matchar inte"
@@ -214,42 +214,42 @@ msgstr "För tidigt filslut i fryst fil"
 msgid "`%s' from frozen file not found in builtin table!"
 msgstr "\"%s\" från fryst fil hittades inte i tabellen för inbyggda makron!"
 
-#: src/input.c:306
+#: src/input.c:309
 #, fuzzy, c-format
 msgid "Input reverted to %s, line %d"
 msgstr "Indata återgår till %s, rad %d"
 
-#: src/input.c:334
+#: src/input.c:337
 #, fuzzy, c-format
 msgid "Input read from %s"
 msgstr "Indata läses från %s"
 
-#: src/input.c:494
+#: src/input.c:497
 #, fuzzy
 msgid "INTERNAL ERROR: Recursive push_string!"
 msgstr "INTERNT FEL: Rekursiv push_string!"
 
-#: src/input.c:611
+#: src/input.c:614
 #, fuzzy
 msgid "INTERNAL ERROR: Bad call to init_macro_token ()"
 msgstr "INTERNT FEL: Otillåtet anrop till init_macro_token ()"
 
-#: src/input.c:651
+#: src/input.c:654
 #, fuzzy
 msgid "INTERNAL ERROR: Input stack botch in next_char ()"
 msgstr "INTERNT FEL: Instacken havererade i next_char ()"
 
-#: src/input.c:688
+#: src/input.c:691
 #, fuzzy
 msgid "INTERNAL ERROR: Input stack botch in peek_input ()"
 msgstr "INTERNT FEL: Instacken havererade i peek_input ()"
 
-#: src/input.c:791
+#: src/input.c:794
 #, fuzzy
 msgid "NONE"
 msgstr "INGET"
 
-#: src/input.c:1130 src/input.c:1157
+#: src/input.c:1133 src/input.c:1160
 #, fuzzy
 msgid "ERROR: EOF in string"
 msgstr "FEL: Filslut i sträng"
@@ -414,31 +414,36 @@ msgstr "Okänd felsökningsflagga \"%s\""
 msgid "INTERNAL ERROR: Bad code in deferred arguments"
 msgstr "INTERNT FEL: Otillåten kod i argument"
 
-#: src/macro.c:92
+#: src/macro.c:93
 #, fuzzy
 msgid "INTERNAL ERROR: Bad token type in expand_token ()"
 msgstr "INTERNT FEL: Otillåten lexikalisk datatyp i expand_token ()"
 
-#: src/macro.c:158
+#: src/macro.c:159
 #, fuzzy
 msgid "ERROR: EOF in argument list"
 msgstr "FEL: Filslut i argumentlistan"
 
-#: src/macro.c:176
+#: src/macro.c:178
 #, fuzzy
 msgid "INTERNAL ERROR: Bad token type in expand_argument ()"
 msgstr "INTERNT FEL: Otillåten lexikalisk datatyp i expand_argument ()"
 
-#: src/macro.c:253
+#: src/macro.c:255
 #, fuzzy
 msgid "INTERNAL ERROR: Bad symbol type in call_macro ()"
 msgstr "INTERNT FEL: Otillåten symboltyp i call_macro ()"
 
-#: src/macro.c:282
+#: src/macro.c:284
 #, fuzzy, c-format
 msgid "ERROR: Recursion limit of %d exceeded, use -L<N> to change it"
 msgstr "FEL: Rekursionsgräns %d överskriden, använd -L<N> för att ändra"
 
+#: src/module.c:128
+#, c-format
+msgid "Error: cannot find module `%s'"
+msgstr ""
+
 #: src/output.c:198
 #, fuzzy
 msgid "ERROR: Cannot create temporary file for diversion"
diff --git a/src/builtin.c b/src/builtin.c
index d83b0def..3e01db2b 100644
--- a/src/builtin.c
+++ b/src/builtin.c
@@ -168,6 +168,17 @@ typedef struct builtin_table builtin_table;
 
 static builtin_table *builtin_tables = NULL;
 
+static void
+push_builtin_table (builtin *table)
+{
+  builtin_table *bt;
+
+  bt = (builtin_table *)xmalloc(sizeof(struct builtin_table));
+  bt->next = builtin_tables;
+  bt->table = table;
+  builtin_tables = bt;
+}
+
 /*----------------------------------------.
 | Find the builtin, which lives on ADDR.  |
 `----------------------------------------*/
@@ -195,6 +206,10 @@ find_builtin_by_name (const char *name)
   const builtin_table *bt;
   const builtin *bp;
 
+  /* This is necessary to load frozen files */
+  if (builtin_tables == NULL)
+    push_builtin_table (builtin_tab);
+
   for (bt = builtin_tables; bt != NULL; bt = bt->next)
     for (bp = bt->table; bp->name != NULL; bp++)
       if (strcmp (bp->name, name) == 0)
@@ -230,14 +245,10 @@ define_builtin (const char *name, const builtin *bp, symbol_lookup mode,
 static void
 install_builtin_table (builtin *table)
 {
-  builtin_table *bt;
   const builtin *bp;
   char *string;
 
-  bt = (builtin_table *)xmalloc(sizeof(struct builtin_table));
-  bt->next = builtin_tables;
-  bt->table = table;
-  builtin_tables = bt;
+  push_builtin_table(table);
 
   for (bp = table; bp->name != NULL; bp++)
     if (!no_gnu_extensions || !bp->gnu_extension)
diff --git a/src/input.c b/src/input.c
index f9bc23a1..8979ea07 100644
--- a/src/input.c
+++ b/src/input.c
@@ -88,9 +88,12 @@
    SYNTAX_ECOMM		A single characters end comment delimiter
 
    Besides adding new facilities, the use of a syntax table will reduce
-   the number of calls to next_token ().  Now SYNTAX_OTHER characters
-   can be returned as a single token, since next_token () knows they
-   have no special syntactical meaning to m4.
+   the number of calls to next_token ().  Now groups of OTHER, NUM and
+   SPACE characters can be returned as a single token, since next_token
+   () knows they have no special syntactical meaning to m4.  This is,
+   however, only possible if only single character quotes comments
+   comments are used, because otherwise the quote and comment characters
+   will not show up in the syntax-table.
 
    Having a syntax table allows new facilities.  The new builtin
    "changesyntax" allows the the user to change the category of any
@@ -1172,7 +1175,7 @@ next_token (token_data *td)
 	}
       type = TOKEN_STRING;
     }
-  else				/* EVERYTHING ELSE */
+  else if (single_quotes && single_comments) /* EVERYTHING ELSE */
     {
       obstack_1grow (&token_stack, ch);
 
@@ -1196,13 +1199,26 @@ next_token (token_data *td)
 	      if (ch != CHAR_EOF)
 		unget_input(ch);
 	    }
-	  type = TOKEN_STRING;
+	  type = TOKEN_SPACE;
 	}
       else if (IS_ACTIVE(ch))
 	type = TOKEN_WORD;
       else
 	type = TOKEN_SIMPLE;
     }
+  else  /* EVERYTHING ELSE */
+    {
+      obstack_1grow (&token_stack, ch);
+
+      if (IS_OTHER(ch) || IS_NUM(ch))
+	type = TOKEN_STRING;
+      else if (IS_SPACE(ch))
+	type = TOKEN_SPACE;
+      else if (IS_ACTIVE(ch))
+	type = TOKEN_WORD;
+      else
+	type = TOKEN_SIMPLE;
+    }
   
 
   obstack_1grow (&token_stack, '\0');
@@ -1244,6 +1260,10 @@ print_token (const char *s, token_type t, token_data *td)
       fprintf (stderr, "string\t\"%s\"\n", TOKEN_DATA_TEXT (td));
       break;
 
+    case TOKEN_SPACE:
+      fprintf (stderr, "space\t\"%s\"\n", TOKEN_DATA_TEXT (td));
+      break;
+
     case TOKEN_MACDEF:
       fprintf (stderr, "macro 0x%x\n", (int)TOKEN_DATA_FUNC (td));
       break;
diff --git a/src/m4.h b/src/m4.h
index 9c7b5ef9..b3fddab8 100644
--- a/src/m4.h
+++ b/src/m4.h
@@ -281,6 +281,7 @@ enum token_type
 {
   TOKEN_EOF,			/* end of file */
   TOKEN_STRING,			/* a quoted string */
+  TOKEN_SPACE,			/* whitespace */
   TOKEN_WORD,			/* an identifier */
   TOKEN_SIMPLE,			/* a single character */
   TOKEN_MACDEF			/* a macros definition (see "defn") */
diff --git a/src/macro.c b/src/macro.c
index 38cc9af2..c85fa00f 100644
--- a/src/macro.c
+++ b/src/macro.c
@@ -65,6 +65,7 @@ expand_token (struct obstack *obs, token_type t, token_data *td)
 
     case TOKEN_SIMPLE:
     case TOKEN_STRING:
+    case TOKEN_SPACE:
       shipout_text (obs, TOKEN_DATA_TEXT (td), strlen (TOKEN_DATA_TEXT (td)));
       break;
 
@@ -120,7 +121,7 @@ expand_argument (struct obstack *obs, token_data *argp)
     {
       t = next_token (&td);
     }
-  while (t == TOKEN_STRING && IS_SPACE (*TOKEN_DATA_TEXT (&td)));
+  while (t == TOKEN_SPACE);
 
   paren_level = 0;
 
@@ -159,6 +160,7 @@ expand_argument (struct obstack *obs, token_data *argp)
 	  break;
 
 	case TOKEN_WORD:
+	case TOKEN_SPACE:
 	case TOKEN_STRING:
 	  expand_token (obs, t, &td);
 	  break;
diff --git a/tests/Makefile.am b/tests/Makefile.am
index d16044d7..296f093f 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -8,72 +8,72 @@ EXTRA_DIST = get-them run-test foo incl.m4 stamp-TESTS \
 TESTS = $(GENERATED_TESTS) $(OTHER_TESTS)
 
 GENERATED_TESTS = \
-	gentest/argument.1.m4 \
-	gentest/argument.2.m4 \
-	gentest/argument.3.m4 \
-	gentest/argument.4.m4 \
-	gentest/changeco.1.m4 \
-	gentest/changeco.2.m4 \
-	gentest/changequ.1.m4 \
-	gentest/changequ.2.m4 \
-	gentest/changequ.3.m4 \
-	gentest/changesy.1.m4 \
-	gentest/changesy.2.m4 \
-	gentest/changesy.3.m4 \
-	gentest/changesy.4.m4 \
-	gentest/changesy.5.m4 \
-	gentest/changesy.6.m4 \
-	gentest/changesy.7.m4 \
-	gentest/cleardiv.1.m4 \
-	gentest/cleardiv.2.m4 \
-	gentest/define.1.m4 \
-	gentest/define.2.m4 \
-	gentest/defn.1.m4 \
-	gentest/defn.2.m4 \
-	gentest/divert.1.m4 \
-	gentest/divert.2.m4 \
-	gentest/divnum.1.m4 \
-	gentest/dnl.1.m4 \
-	gentest/dumpdef.1.m4 \
-	gentest/errprint.1.m4 \
-	gentest/errprint.2.m4 \
-	gentest/esyscmd.1.m4 \
-	gentest/eval.1.m4 \
-	gentest/eval.2.m4 \
-	gentest/format.1.m4 \
-	gentest/ifdef.1.m4 \
-	gentest/ifelse.1.m4 \
-	gentest/ifelse.2.m4 \
-	gentest/include.1.m4 \
-	gentest/include.2.m4 \
-	gentest/include.3.m4 \
-	gentest/incr.1.m4 \
-	gentest/index.1.m4 \
-	gentest/indir.1.m4 \
-	gentest/len.1.m4 \
-	gentest/loops.1.m4 \
-	gentest/loops.2.m4 \
-	gentest/m4exit.1.m4 \
-	gentest/m4wrap.1.m4 \
-	gentest/patsubst.1.m4 \
-	gentest/patsubst.2.m4 \
-	gentest/pseudoar.1.m4 \
-	gentest/pseudoar.2.m4 \
-	gentest/pseudoar.3.m4 \
-	gentest/pseudoar.4.m4 \
-	gentest/pseudoar.5.m4 \
-	gentest/pushdef.1.m4 \
-	gentest/pushdef.2.m4 \
-	gentest/regexp.1.m4 \
-	gentest/regexp.2.m4 \
-	gentest/substr.1.m4 \
-	gentest/sysval.1.m4 \
-	gentest/trace.1.m4 \
-	gentest/translit.1.m4 \
-	gentest/undefine.1.m4 \
-	gentest/undivert.1.m4 \
-	gentest/undivert.2.m4 \
-	gentest/undivert.3.m4
+	gentest/argument.1.test \
+	gentest/argument.2.test \
+	gentest/argument.3.test \
+	gentest/argument.4.test \
+	gentest/changeco.1.test \
+	gentest/changeco.2.test \
+	gentest/changequ.1.test \
+	gentest/changequ.2.test \
+	gentest/changequ.3.test \
+	gentest/changesy.1.test \
+	gentest/changesy.2.test \
+	gentest/changesy.3.test \
+	gentest/changesy.4.test \
+	gentest/changesy.5.test \
+	gentest/changesy.6.test \
+	gentest/changesy.7.test \
+	gentest/cleardiv.1.test \
+	gentest/cleardiv.2.test \
+	gentest/define.1.test \
+	gentest/define.2.test \
+	gentest/defn.1.test \
+	gentest/defn.2.test \
+	gentest/divert.1.test \
+	gentest/divert.2.test \
+	gentest/divnum.1.test \
+	gentest/dnl.1.test \
+	gentest/dumpdef.1.test \
+	gentest/errprint.1.test \
+	gentest/errprint.2.test \
+	gentest/esyscmd.1.test \
+	gentest/eval.1.test \
+	gentest/eval.2.test \
+	gentest/format.1.test \
+	gentest/ifdef.1.test \
+	gentest/ifelse.1.test \
+	gentest/ifelse.2.test \
+	gentest/include.1.test \
+	gentest/include.2.test \
+	gentest/include.3.test \
+	gentest/incr.1.test \
+	gentest/index.1.test \
+	gentest/indir.1.test \
+	gentest/len.1.test \
+	gentest/loops.1.test \
+	gentest/loops.2.test \
+	gentest/m4exit.1.test \
+	gentest/m4wrap.1.test \
+	gentest/patsubst.1.test \
+	gentest/patsubst.2.test \
+	gentest/pseudoar.1.test \
+	gentest/pseudoar.2.test \
+	gentest/pseudoar.3.test \
+	gentest/pseudoar.4.test \
+	gentest/pseudoar.5.test \
+	gentest/pushdef.1.test \
+	gentest/pushdef.2.test \
+	gentest/regexp.1.test \
+	gentest/regexp.2.test \
+	gentest/substr.1.test \
+	gentest/sysval.1.test \
+	gentest/trace.1.test \
+	gentest/translit.1.test \
+	gentest/undefine.1.test \
+	gentest/undivert.1.test \
+	gentest/undivert.2.test \
+	gentest/undivert.3.test
 
 OTHER_TESTS = \
 	../examples/comments.test \
diff --git a/tests/Makefile.in b/tests/Makefile.in
index 412f67dd..a4f80efc 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -98,72 +98,72 @@ EXTRA_DIST = get-them run-test foo incl.m4 stamp-TESTS \
 TESTS = $(GENERATED_TESTS) $(OTHER_TESTS)
 
 GENERATED_TESTS = \
-	gentest/argument.1.m4 \
-	gentest/argument.2.m4 \
-	gentest/argument.3.m4 \
-	gentest/argument.4.m4 \
-	gentest/changeco.1.m4 \
-	gentest/changeco.2.m4 \
-	gentest/changequ.1.m4 \
-	gentest/changequ.2.m4 \
-	gentest/changequ.3.m4 \
-	gentest/changesy.1.m4 \
-	gentest/changesy.2.m4 \
-	gentest/changesy.3.m4 \
-	gentest/changesy.4.m4 \
-	gentest/changesy.5.m4 \
-	gentest/changesy.6.m4 \
-	gentest/changesy.7.m4 \
-	gentest/cleardiv.1.m4 \
-	gentest/cleardiv.2.m4 \
-	gentest/define.1.m4 \
-	gentest/define.2.m4 \
-	gentest/defn.1.m4 \
-	gentest/defn.2.m4 \
-	gentest/divert.1.m4 \
-	gentest/divert.2.m4 \
-	gentest/divnum.1.m4 \
-	gentest/dnl.1.m4 \
-	gentest/dumpdef.1.m4 \
-	gentest/errprint.1.m4 \
-	gentest/errprint.2.m4 \
-	gentest/esyscmd.1.m4 \
-	gentest/eval.1.m4 \
-	gentest/eval.2.m4 \
-	gentest/format.1.m4 \
-	gentest/ifdef.1.m4 \
-	gentest/ifelse.1.m4 \
-	gentest/ifelse.2.m4 \
-	gentest/include.1.m4 \
-	gentest/include.2.m4 \
-	gentest/include.3.m4 \
-	gentest/incr.1.m4 \
-	gentest/index.1.m4 \
-	gentest/indir.1.m4 \
-	gentest/len.1.m4 \
-	gentest/loops.1.m4 \
-	gentest/loops.2.m4 \
-	gentest/m4exit.1.m4 \
-	gentest/m4wrap.1.m4 \
-	gentest/patsubst.1.m4 \
-	gentest/patsubst.2.m4 \
-	gentest/pseudoar.1.m4 \
-	gentest/pseudoar.2.m4 \
-	gentest/pseudoar.3.m4 \
-	gentest/pseudoar.4.m4 \
-	gentest/pseudoar.5.m4 \
-	gentest/pushdef.1.m4 \
-	gentest/pushdef.2.m4 \
-	gentest/regexp.1.m4 \
-	gentest/regexp.2.m4 \
-	gentest/substr.1.m4 \
-	gentest/sysval.1.m4 \
-	gentest/trace.1.m4 \
-	gentest/translit.1.m4 \
-	gentest/undefine.1.m4 \
-	gentest/undivert.1.m4 \
-	gentest/undivert.2.m4 \
-	gentest/undivert.3.m4
+	gentest/argument.1.test \
+	gentest/argument.2.test \
+	gentest/argument.3.test \
+	gentest/argument.4.test \
+	gentest/changeco.1.test \
+	gentest/changeco.2.test \
+	gentest/changequ.1.test \
+	gentest/changequ.2.test \
+	gentest/changequ.3.test \
+	gentest/changesy.1.test \
+	gentest/changesy.2.test \
+	gentest/changesy.3.test \
+	gentest/changesy.4.test \
+	gentest/changesy.5.test \
+	gentest/changesy.6.test \
+	gentest/changesy.7.test \
+	gentest/cleardiv.1.test \
+	gentest/cleardiv.2.test \
+	gentest/define.1.test \
+	gentest/define.2.test \
+	gentest/defn.1.test \
+	gentest/defn.2.test \
+	gentest/divert.1.test \
+	gentest/divert.2.test \
+	gentest/divnum.1.test \
+	gentest/dnl.1.test \
+	gentest/dumpdef.1.test \
+	gentest/errprint.1.test \
+	gentest/errprint.2.test \
+	gentest/esyscmd.1.test \
+	gentest/eval.1.test \
+	gentest/eval.2.test \
+	gentest/format.1.test \
+	gentest/ifdef.1.test \
+	gentest/ifelse.1.test \
+	gentest/ifelse.2.test \
+	gentest/include.1.test \
+	gentest/include.2.test \
+	gentest/include.3.test \
+	gentest/incr.1.test \
+	gentest/index.1.test \
+	gentest/indir.1.test \
+	gentest/len.1.test \
+	gentest/loops.1.test \
+	gentest/loops.2.test \
+	gentest/m4exit.1.test \
+	gentest/m4wrap.1.test \
+	gentest/patsubst.1.test \
+	gentest/patsubst.2.test \
+	gentest/pseudoar.1.test \
+	gentest/pseudoar.2.test \
+	gentest/pseudoar.3.test \
+	gentest/pseudoar.4.test \
+	gentest/pseudoar.5.test \
+	gentest/pushdef.1.test \
+	gentest/pushdef.2.test \
+	gentest/regexp.1.test \
+	gentest/regexp.2.test \
+	gentest/substr.1.test \
+	gentest/sysval.1.test \
+	gentest/trace.1.test \
+	gentest/translit.1.test \
+	gentest/undefine.1.test \
+	gentest/undivert.1.test \
+	gentest/undivert.2.test \
+	gentest/undivert.3.test
 
 OTHER_TESTS = \
 	../examples/comments.test \
diff --git a/tests/gentest/argument.1.m4 b/tests/gentest/argument.1.test
index 04909dc9..e8f48197 100755
--- a/tests/gentest/argument.1.m4
+++ b/tests/gentest/argument.1.test
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# gentest/argument.1.m4 is part of the GNU m4 testsuite
+# gentest/argument.1.test is part of the GNU m4 testsuite
 # generated from example in ../doc/m4.texinfo line 1036
 
 . ${srcdir}/defs
diff --git a/tests/gentest/argument.2.m4 b/tests/gentest/argument.2.test
index 59814143..3e2149b5 100755
--- a/tests/gentest/argument.2.m4
+++ b/tests/gentest/argument.2.test
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# gentest/argument.2.m4 is part of the GNU m4 testsuite
+# gentest/argument.2.test is part of the GNU m4 testsuite
 # generated from example in ../doc/m4.texinfo line 1046
 
 . ${srcdir}/defs
diff --git a/tests/gentest/argument.3.m4 b/tests/gentest/argument.3.test
index 3dae6ca9..5ffdafd4 100755
--- a/tests/gentest/argument.3.m4
+++ b/tests/gentest/argument.3.test
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# gentest/argument.3.m4 is part of the GNU m4 testsuite
+# gentest/argument.3.test is part of the GNU m4 testsuite
 # generated from example in ../doc/m4.texinfo line 1066
 
 . ${srcdir}/defs
diff --git a/tests/gentest/argument.4.m4 b/tests/gentest/argument.4.test
index 39389759..b28f5638 100755
--- a/tests/gentest/argument.4.m4
+++ b/tests/gentest/argument.4.test
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# gentest/argument.4.m4 is part of the GNU m4 testsuite
+# gentest/argument.4.test is part of the GNU m4 testsuite
 # generated from example in ../doc/m4.texinfo line 1076
 
 . ${srcdir}/defs
diff --git a/tests/gentest/changeco.1.m4 b/tests/gentest/changeco.1.test
index 533b931b..08ad873d 100755
--- a/tests/gentest/changeco.1.m4
+++ b/tests/gentest/changeco.1.test
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# gentest/changeco.1.m4 is part of the GNU m4 testsuite
+# gentest/changeco.1.test is part of the GNU m4 testsuite
 # generated from example in ../doc/m4.texinfo line 1959
 
 . ${srcdir}/defs
diff --git a/tests/gentest/changeco.2.m4 b/tests/gentest/changeco.2.test
index dfd0aa1d..c265d1f5 100755
--- a/tests/gentest/changeco.2.m4
+++ b/tests/gentest/changeco.2.test
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# gentest/changeco.2.m4 is part of the GNU m4 testsuite
+# gentest/changeco.2.test is part of the GNU m4 testsuite
 # generated from example in ../doc/m4.texinfo line 1980
 
 . ${srcdir}/defs
diff --git a/tests/gentest/changequ.1.m4 b/tests/gentest/changequ.1.test
index 7022cec9..f0f64f69 100755
--- a/tests/gentest/changequ.1.m4
+++ b/tests/gentest/changequ.1.test
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# gentest/changequ.1.m4 is part of the GNU m4 testsuite
+# gentest/changequ.1.test is part of the GNU m4 testsuite
 # generated from example in ../doc/m4.texinfo line 1895
 
 . ${srcdir}/defs
diff --git a/tests/gentest/changequ.2.m4 b/tests/gentest/changequ.2.test
index 5eba166b..0ec4ad14 100755
--- a/tests/gentest/changequ.2.m4
+++ b/tests/gentest/changequ.2.test
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# gentest/changequ.2.m4 is part of the GNU m4 testsuite
+# gentest/changequ.2.test is part of the GNU m4 testsuite
 # generated from example in ../doc/m4.texinfo line 1907
 
 . ${srcdir}/defs
diff --git a/tests/gentest/changequ.3.m4 b/tests/gentest/changequ.3.test
index 6174e994..83a8544f 100755
--- a/tests/gentest/changequ.3.m4
+++ b/tests/gentest/changequ.3.test
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# gentest/changequ.3.m4 is part of the GNU m4 testsuite
+# gentest/changequ.3.test is part of the GNU m4 testsuite
 # generated from example in ../doc/m4.texinfo line 1919
 
 . ${srcdir}/defs
diff --git a/tests/gentest/changesy.1.m4 b/tests/gentest/changesy.1.test
index c608a21f..344bf506 100755
--- a/tests/gentest/changesy.1.m4
+++ b/tests/gentest/changesy.1.test
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# gentest/changesy.1.m4 is part of the GNU m4 testsuite
+# gentest/changesy.1.test is part of the GNU m4 testsuite
 # generated from example in ../doc/m4.texinfo line 2125
 
 . ${srcdir}/defs
diff --git a/tests/gentest/changesy.2.m4 b/tests/gentest/changesy.2.test
index 55a99375..544a8753 100755
--- a/tests/gentest/changesy.2.m4
+++ b/tests/gentest/changesy.2.test
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# gentest/changesy.2.m4 is part of the GNU m4 testsuite
+# gentest/changesy.2.test is part of the GNU m4 testsuite
 # generated from example in ../doc/m4.texinfo line 2141
 
 . ${srcdir}/defs
diff --git a/tests/gentest/changesy.3.m4 b/tests/gentest/changesy.3.test
index 8f86a03a..79030e78 100755
--- a/tests/gentest/changesy.3.m4
+++ b/tests/gentest/changesy.3.test
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# gentest/changesy.3.m4 is part of the GNU m4 testsuite
+# gentest/changesy.3.test is part of the GNU m4 testsuite
 # generated from example in ../doc/m4.texinfo line 2158
 
 . ${srcdir}/defs
diff --git a/tests/gentest/changesy.4.m4 b/tests/gentest/changesy.4.test
index 9ee5b7d1..7df01f9e 100755
--- a/tests/gentest/changesy.4.m4
+++ b/tests/gentest/changesy.4.test
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# gentest/changesy.4.m4 is part of the GNU m4 testsuite
+# gentest/changesy.4.test is part of the GNU m4 testsuite
 # generated from example in ../doc/m4.texinfo line 2177
 
 . ${srcdir}/defs
diff --git a/tests/gentest/changesy.5.m4 b/tests/gentest/changesy.5.test
index 2035d2b9..25640e31 100755
--- a/tests/gentest/changesy.5.m4
+++ b/tests/gentest/changesy.5.test
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# gentest/changesy.5.m4 is part of the GNU m4 testsuite
+# gentest/changesy.5.test is part of the GNU m4 testsuite
 # generated from example in ../doc/m4.texinfo line 2201
 
 . ${srcdir}/defs
diff --git a/tests/gentest/changesy.6.m4 b/tests/gentest/changesy.6.test
index 88cac7a4..91cfc80a 100755
--- a/tests/gentest/changesy.6.m4
+++ b/tests/gentest/changesy.6.test
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# gentest/changesy.6.m4 is part of the GNU m4 testsuite
+# gentest/changesy.6.test is part of the GNU m4 testsuite
 # generated from example in ../doc/m4.texinfo line 2223
 
 . ${srcdir}/defs
diff --git a/tests/gentest/changesy.7.m4 b/tests/gentest/changesy.7.test
index 7a366945..014c152f 100755
--- a/tests/gentest/changesy.7.m4
+++ b/tests/gentest/changesy.7.test
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# gentest/changesy.7.m4 is part of the GNU m4 testsuite
+# gentest/changesy.7.test is part of the GNU m4 testsuite
 # generated from example in ../doc/m4.texinfo line 2234
 
 . ${srcdir}/defs
@@ -20,7 +20,7 @@ cat <<\EOF >ok
 
 ==testing]==
 ==testing>>==
-==<<testing>>==
+==testing==
 EOF
 
 $M4 -d in >out
diff --git a/tests/gentest/cleardiv.1.m4 b/tests/gentest/cleardiv.1.test
index 36cba76a..d9883e43 100755
--- a/tests/gentest/cleardiv.1.m4
+++ b/tests/gentest/cleardiv.1.test
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# gentest/cleardiv.1.m4 is part of the GNU m4 testsuite
+# gentest/cleardiv.1.test is part of the GNU m4 testsuite
 # generated from example in ../doc/m4.texinfo line 2738
 
 . ${srcdir}/defs
diff --git a/tests/gentest/cleardiv.2.m4 b/tests/gentest/cleardiv.2.test
index e44667a9..7e78d8a4 100755
--- a/tests/gentest/cleardiv.2.m4
+++ b/tests/gentest/cleardiv.2.test
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# gentest/cleardiv.2.m4 is part of the GNU m4 testsuite
+# gentest/cleardiv.2.test is part of the GNU m4 testsuite
 # generated from example in ../doc/m4.texinfo line 2753
 
 . ${srcdir}/defs
diff --git a/tests/gentest/define.1.m4 b/tests/gentest/define.1.test
index 17f30775..fb364668 100755
--- a/tests/gentest/define.1.m4
+++ b/tests/gentest/define.1.test
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# gentest/define.1.m4 is part of the GNU m4 testsuite
+# gentest/define.1.test is part of the GNU m4 testsuite
 # generated from example in ../doc/m4.texinfo line 987
 
 . ${srcdir}/defs
diff --git a/tests/gentest/define.2.m4 b/tests/gentest/define.2.test
index 62e2ea0e..028642c3 100755
--- a/tests/gentest/define.2.m4
+++ b/tests/gentest/define.2.test
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# gentest/define.2.m4 is part of the GNU m4 testsuite
+# gentest/define.2.test is part of the GNU m4 testsuite
 # generated from example in ../doc/m4.texinfo line 1007
 
 . ${srcdir}/defs
diff --git a/tests/gentest/defn.1.m4 b/tests/gentest/defn.1.test
index c3f06939..868dc07e 100755
--- a/tests/gentest/defn.1.m4
+++ b/tests/gentest/defn.1.test
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# gentest/defn.1.m4 is part of the GNU m4 testsuite
+# gentest/defn.1.test is part of the GNU m4 testsuite
 # generated from example in ../doc/m4.texinfo line 1230
 
 . ${srcdir}/defs
diff --git a/tests/gentest/defn.2.m4 b/tests/gentest/defn.2.test
index 0422980b..df1925d4 100755
--- a/tests/gentest/defn.2.m4
+++ b/tests/gentest/defn.2.test
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# gentest/defn.2.m4 is part of the GNU m4 testsuite
+# gentest/defn.2.test is part of the GNU m4 testsuite
 # generated from example in ../doc/m4.texinfo line 1250
 
 . ${srcdir}/defs
diff --git a/tests/gentest/divert.1.m4 b/tests/gentest/divert.1.test
index acfc17d7..f675ba00 100755
--- a/tests/gentest/divert.1.m4
+++ b/tests/gentest/divert.1.test
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# gentest/divert.1.m4 is part of the GNU m4 testsuite
+# gentest/divert.1.test is part of the GNU m4 testsuite
 # generated from example in ../doc/m4.texinfo line 2580
 
 . ${srcdir}/defs
diff --git a/tests/gentest/divert.2.m4 b/tests/gentest/divert.2.test
index 13075ff7..87f745d7 100755
--- a/tests/gentest/divert.2.m4
+++ b/tests/gentest/divert.2.test
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# gentest/divert.2.m4 is part of the GNU m4 testsuite
+# gentest/divert.2.test is part of the GNU m4 testsuite
 # generated from example in ../doc/m4.texinfo line 2600
 
 . ${srcdir}/defs
diff --git a/tests/gentest/divnum.1.m4 b/tests/gentest/divnum.1.test
index 4f49f918..b1866d7b 100755
--- a/tests/gentest/divnum.1.m4
+++ b/tests/gentest/divnum.1.test
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# gentest/divnum.1.m4 is part of the GNU m4 testsuite
+# gentest/divnum.1.test is part of the GNU m4 testsuite
 # generated from example in ../doc/m4.texinfo line 2707
 
 . ${srcdir}/defs
diff --git a/tests/gentest/dnl.1.m4 b/tests/gentest/dnl.1.test
index 5d0d7632..f27916b3 100755
--- a/tests/gentest/dnl.1.m4
+++ b/tests/gentest/dnl.1.test
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# gentest/dnl.1.m4 is part of the GNU m4 testsuite
+# gentest/dnl.1.test is part of the GNU m4 testsuite
 # generated from example in ../doc/m4.texinfo line 1857
 
 . ${srcdir}/defs
diff --git a/tests/gentest/dumpdef.1.m4 b/tests/gentest/dumpdef.1.test
index bc31e1df..c2a00ded 100755
--- a/tests/gentest/dumpdef.1.m4
+++ b/tests/gentest/dumpdef.1.test
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# gentest/dumpdef.1.m4 is part of the GNU m4 testsuite
+# gentest/dumpdef.1.test is part of the GNU m4 testsuite
 # generated from example in ../doc/m4.texinfo line 1660
 
 . ${srcdir}/defs
diff --git a/tests/gentest/errprint.1.m4 b/tests/gentest/errprint.1.test
index 107ef789..b703dd30 100755
--- a/tests/gentest/errprint.1.m4
+++ b/tests/gentest/errprint.1.test
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# gentest/errprint.1.m4 is part of the GNU m4 testsuite
+# gentest/errprint.1.test is part of the GNU m4 testsuite
 # generated from example in ../doc/m4.texinfo line 3426
 
 . ${srcdir}/defs
diff --git a/tests/gentest/errprint.2.m4 b/tests/gentest/errprint.2.test
index 5259782d..4ca64136 100755
--- a/tests/gentest/errprint.2.m4
+++ b/tests/gentest/errprint.2.test
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# gentest/errprint.2.m4 is part of the GNU m4 testsuite
+# gentest/errprint.2.test is part of the GNU m4 testsuite
 # generated from example in ../doc/m4.texinfo line 3451
 
 . ${srcdir}/defs
diff --git a/tests/gentest/esyscmd.1.m4 b/tests/gentest/esyscmd.1.test
index 856620e4..8d609baf 100755
--- a/tests/gentest/esyscmd.1.m4
+++ b/tests/gentest/esyscmd.1.test
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# gentest/esyscmd.1.m4 is part of the GNU m4 testsuite
+# gentest/esyscmd.1.test is part of the GNU m4 testsuite
 # generated from example in ../doc/m4.texinfo line 3315
 
 . ${srcdir}/defs
diff --git a/tests/gentest/eval.1.m4 b/tests/gentest/eval.1.test
index b3d38cc3..56f916c2 100755
--- a/tests/gentest/eval.1.m4
+++ b/tests/gentest/eval.1.test
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# gentest/eval.1.m4 is part of the GNU m4 testsuite
+# gentest/eval.1.test is part of the GNU m4 testsuite
 # generated from example in ../doc/m4.texinfo line 3199
 
 . ${srcdir}/defs
diff --git a/tests/gentest/eval.2.m4 b/tests/gentest/eval.2.test
index bd394eb4..abc9fbb6 100755
--- a/tests/gentest/eval.2.m4
+++ b/tests/gentest/eval.2.test
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# gentest/eval.2.m4 is part of the GNU m4 testsuite
+# gentest/eval.2.test is part of the GNU m4 testsuite
 # generated from example in ../doc/m4.texinfo line 3230
 
 . ${srcdir}/defs
diff --git a/tests/gentest/format.1.m4 b/tests/gentest/format.1.test
index ddfdb7f6..84c50d0a 100755
--- a/tests/gentest/format.1.m4
+++ b/tests/gentest/format.1.test
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# gentest/format.1.m4 is part of the GNU m4 testsuite
+# gentest/format.1.test is part of the GNU m4 testsuite
 # generated from example in ../doc/m4.texinfo line 3035
 
 . ${srcdir}/defs
diff --git a/tests/gentest/ifdef.1.m4 b/tests/gentest/ifdef.1.test
index 721608c0..fb9951c7 100755
--- a/tests/gentest/ifdef.1.m4
+++ b/tests/gentest/ifdef.1.test
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# gentest/ifdef.1.m4 is part of the GNU m4 testsuite
+# gentest/ifdef.1.test is part of the GNU m4 testsuite
 # generated from example in ../doc/m4.texinfo line 1440
 
 . ${srcdir}/defs
diff --git a/tests/gentest/ifelse.1.m4 b/tests/gentest/ifelse.1.test
index 0d6fbcf0..851c3005 100755
--- a/tests/gentest/ifelse.1.m4
+++ b/tests/gentest/ifelse.1.test
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# gentest/ifelse.1.m4 is part of the GNU m4 testsuite
+# gentest/ifelse.1.test is part of the GNU m4 testsuite
 # generated from example in ../doc/m4.texinfo line 1478
 
 . ${srcdir}/defs
diff --git a/tests/gentest/ifelse.2.m4 b/tests/gentest/ifelse.2.test
index 0cf36999..2573945b 100755
--- a/tests/gentest/ifelse.2.m4
+++ b/tests/gentest/ifelse.2.test
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# gentest/ifelse.2.m4 is part of the GNU m4 testsuite
+# gentest/ifelse.2.test is part of the GNU m4 testsuite
 # generated from example in ../doc/m4.texinfo line 1497
 
 . ${srcdir}/defs
diff --git a/tests/gentest/include.1.m4 b/tests/gentest/include.1.test
index e2912c84..55e186eb 100755
--- a/tests/gentest/include.1.m4
+++ b/tests/gentest/include.1.test
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# gentest/include.1.m4 is part of the GNU m4 testsuite
+# gentest/include.1.test is part of the GNU m4 testsuite
 # generated from example in ../doc/m4.texinfo line 2454
 
 . ${srcdir}/defs
diff --git a/tests/gentest/include.2.m4 b/tests/gentest/include.2.test
index 15a2ea64..9257157c 100755
--- a/tests/gentest/include.2.m4
+++ b/tests/gentest/include.2.test
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# gentest/include.2.m4 is part of the GNU m4 testsuite
+# gentest/include.2.test is part of the GNU m4 testsuite
 # generated from example in ../doc/m4.texinfo line 2474
 
 . ${srcdir}/defs
diff --git a/tests/gentest/include.3.m4 b/tests/gentest/include.3.test
index 0f286a81..19c911b2 100755
--- a/tests/gentest/include.3.m4
+++ b/tests/gentest/include.3.test
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# gentest/include.3.m4 is part of the GNU m4 testsuite
+# gentest/include.3.test is part of the GNU m4 testsuite
 # generated from example in ../doc/m4.texinfo line 2489
 
 . ${srcdir}/defs
diff --git a/tests/gentest/incr.1.m4 b/tests/gentest/incr.1.test
index 16035bd3..d9da8faa 100755
--- a/tests/gentest/incr.1.m4
+++ b/tests/gentest/incr.1.test
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# gentest/incr.1.m4 is part of the GNU m4 testsuite
+# gentest/incr.1.test is part of the GNU m4 testsuite
 # generated from example in ../doc/m4.texinfo line 3105
 
 . ${srcdir}/defs
diff --git a/tests/gentest/index.1.m4 b/tests/gentest/index.1.test
index 28771378..2226ab97 100755
--- a/tests/gentest/index.1.m4
+++ b/tests/gentest/index.1.test
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# gentest/index.1.m4 is part of the GNU m4 testsuite
+# gentest/index.1.test is part of the GNU m4 testsuite
 # generated from example in ../doc/m4.texinfo line 2821
 
 . ${srcdir}/defs
diff --git a/tests/gentest/indir.1.m4 b/tests/gentest/indir.1.test
index e1714a5b..ddb86909 100755
--- a/tests/gentest/indir.1.m4
+++ b/tests/gentest/indir.1.test
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# gentest/indir.1.m4 is part of the GNU m4 testsuite
+# gentest/indir.1.test is part of the GNU m4 testsuite
 # generated from example in ../doc/m4.texinfo line 1369
 
 . ${srcdir}/defs
diff --git a/tests/gentest/len.1.m4 b/tests/gentest/len.1.test
index 1fa71023..8799457a 100755
--- a/tests/gentest/len.1.m4
+++ b/tests/gentest/len.1.test
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# gentest/len.1.m4 is part of the GNU m4 testsuite
+# gentest/len.1.test is part of the GNU m4 testsuite
 # generated from example in ../doc/m4.texinfo line 2795
 
 . ${srcdir}/defs
diff --git a/tests/gentest/loops.1.m4 b/tests/gentest/loops.1.test
index 791e2560..bf2b5264 100755
--- a/tests/gentest/loops.1.m4
+++ b/tests/gentest/loops.1.test
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# gentest/loops.1.m4 is part of the GNU m4 testsuite
+# gentest/loops.1.test is part of the GNU m4 testsuite
 # generated from example in ../doc/m4.texinfo line 1534
 
 . ${srcdir}/defs
diff --git a/tests/gentest/loops.2.m4 b/tests/gentest/loops.2.test
index 88c305f5..5e38e47e 100755
--- a/tests/gentest/loops.2.m4
+++ b/tests/gentest/loops.2.test
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# gentest/loops.2.m4 is part of the GNU m4 testsuite
+# gentest/loops.2.test is part of the GNU m4 testsuite
 # generated from example in ../doc/m4.texinfo line 1546
 
 . ${srcdir}/defs
diff --git a/tests/gentest/m4exit.1.m4 b/tests/gentest/m4exit.1.test
index 7ba446b1..43a4b004 100755
--- a/tests/gentest/m4exit.1.m4
+++ b/tests/gentest/m4exit.1.test
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# gentest/m4exit.1.m4 is part of the GNU m4 testsuite
+# gentest/m4exit.1.test is part of the GNU m4 testsuite
 # generated from example in ../doc/m4.texinfo line 3474
 
 . ${srcdir}/defs
diff --git a/tests/gentest/m4wrap.1.m4 b/tests/gentest/m4wrap.1.test
index a8315641..c6327beb 100755
--- a/tests/gentest/m4wrap.1.m4
+++ b/tests/gentest/m4wrap.1.test
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# gentest/m4wrap.1.m4 is part of the GNU m4 testsuite
+# gentest/m4wrap.1.test is part of the GNU m4 testsuite
 # generated from example in ../doc/m4.texinfo line 2395
 
 . ${srcdir}/defs
diff --git a/tests/gentest/patsubst.1.m4 b/tests/gentest/patsubst.1.test
index 1b39ecba..6213ef87 100755
--- a/tests/gentest/patsubst.1.m4
+++ b/tests/gentest/patsubst.1.test
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# gentest/patsubst.1.m4 is part of the GNU m4 testsuite
+# gentest/patsubst.1.test is part of the GNU m4 testsuite
 # generated from example in ../doc/m4.texinfo line 2983
 
 . ${srcdir}/defs
diff --git a/tests/gentest/patsubst.2.m4 b/tests/gentest/patsubst.2.test
index f8644359..b31e4d80 100755
--- a/tests/gentest/patsubst.2.m4
+++ b/tests/gentest/patsubst.2.test
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# gentest/patsubst.2.m4 is part of the GNU m4 testsuite
+# gentest/patsubst.2.test is part of the GNU m4 testsuite
 # generated from example in ../doc/m4.texinfo line 3000
 
 . ${srcdir}/defs
diff --git a/tests/gentest/pseudoar.1.m4 b/tests/gentest/pseudoar.1.test
index 29721fa1..50260e65 100755
--- a/tests/gentest/pseudoar.1.m4
+++ b/tests/gentest/pseudoar.1.test
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# gentest/pseudoar.1.m4 is part of the GNU m4 testsuite
+# gentest/pseudoar.1.test is part of the GNU m4 testsuite
 # generated from example in ../doc/m4.texinfo line 1100
 
 . ${srcdir}/defs
diff --git a/tests/gentest/pseudoar.2.m4 b/tests/gentest/pseudoar.2.test
index 47231cf4..ca939b81 100755
--- a/tests/gentest/pseudoar.2.m4
+++ b/tests/gentest/pseudoar.2.test
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# gentest/pseudoar.2.m4 is part of the GNU m4 testsuite
+# gentest/pseudoar.2.test is part of the GNU m4 testsuite
 # generated from example in ../doc/m4.texinfo line 1114
 
 . ${srcdir}/defs
diff --git a/tests/gentest/pseudoar.3.m4 b/tests/gentest/pseudoar.3.test
index 997641f3..b29b17fc 100755
--- a/tests/gentest/pseudoar.3.m4
+++ b/tests/gentest/pseudoar.3.test
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# gentest/pseudoar.3.m4 is part of the GNU m4 testsuite
+# gentest/pseudoar.3.test is part of the GNU m4 testsuite
 # generated from example in ../doc/m4.texinfo line 1125
 
 . ${srcdir}/defs
diff --git a/tests/gentest/pseudoar.4.m4 b/tests/gentest/pseudoar.4.test
index 68b7b6ef..81616f26 100755
--- a/tests/gentest/pseudoar.4.m4
+++ b/tests/gentest/pseudoar.4.test
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# gentest/pseudoar.4.m4 is part of the GNU m4 testsuite
+# gentest/pseudoar.4.test is part of the GNU m4 testsuite
 # generated from example in ../doc/m4.texinfo line 1135
 
 . ${srcdir}/defs
diff --git a/tests/gentest/pseudoar.5.m4 b/tests/gentest/pseudoar.5.test
index 8c01d6f7..e90de1fa 100755
--- a/tests/gentest/pseudoar.5.m4
+++ b/tests/gentest/pseudoar.5.test
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# gentest/pseudoar.5.m4 is part of the GNU m4 testsuite
+# gentest/pseudoar.5.test is part of the GNU m4 testsuite
 # generated from example in ../doc/m4.texinfo line 1155
 
 . ${srcdir}/defs
diff --git a/tests/gentest/pushdef.1.m4 b/tests/gentest/pushdef.1.test
index ac11f585..d934f422 100755
--- a/tests/gentest/pushdef.1.m4
+++ b/tests/gentest/pushdef.1.test
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# gentest/pushdef.1.m4 is part of the GNU m4 testsuite
+# gentest/pushdef.1.test is part of the GNU m4 testsuite
 # generated from example in ../doc/m4.texinfo line 1294
 
 . ${srcdir}/defs
diff --git a/tests/gentest/pushdef.2.m4 b/tests/gentest/pushdef.2.test
index 07eb0c79..7d43770f 100755
--- a/tests/gentest/pushdef.2.m4
+++ b/tests/gentest/pushdef.2.test
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# gentest/pushdef.2.m4 is part of the GNU m4 testsuite
+# gentest/pushdef.2.test is part of the GNU m4 testsuite
 # generated from example in ../doc/m4.texinfo line 1318
 
 . ${srcdir}/defs
diff --git a/tests/gentest/regexp.1.m4 b/tests/gentest/regexp.1.test
index d27cf8e7..3427751e 100755
--- a/tests/gentest/regexp.1.m4
+++ b/tests/gentest/regexp.1.test
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# gentest/regexp.1.m4 is part of the GNU m4 testsuite
+# gentest/regexp.1.test is part of the GNU m4 testsuite
 # generated from example in ../doc/m4.texinfo line 2853
 
 . ${srcdir}/defs
diff --git a/tests/gentest/regexp.2.m4 b/tests/gentest/regexp.2.test
index a75bdc6f..c3ff8894 100755
--- a/tests/gentest/regexp.2.m4
+++ b/tests/gentest/regexp.2.test
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# gentest/regexp.2.m4 is part of the GNU m4 testsuite
+# gentest/regexp.2.test is part of the GNU m4 testsuite
 # generated from example in ../doc/m4.texinfo line 2865
 
 . ${srcdir}/defs
diff --git a/tests/gentest/substr.1.m4 b/tests/gentest/substr.1.test
index 6354c598..964ab0eb 100755
--- a/tests/gentest/substr.1.m4
+++ b/tests/gentest/substr.1.test
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# gentest/substr.1.m4 is part of the GNU m4 testsuite
+# gentest/substr.1.test is part of the GNU m4 testsuite
 # generated from example in ../doc/m4.texinfo line 2891
 
 . ${srcdir}/defs
diff --git a/tests/gentest/sysval.1.m4 b/tests/gentest/sysval.1.test
index f1ffeb7b..6e101fd7 100755
--- a/tests/gentest/sysval.1.m4
+++ b/tests/gentest/sysval.1.test
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# gentest/sysval.1.m4 is part of the GNU m4 testsuite
+# gentest/sysval.1.test is part of the GNU m4 testsuite
 # generated from example in ../doc/m4.texinfo line 3346
 
 . ${srcdir}/defs
diff --git a/tests/gentest/trace.1.m4 b/tests/gentest/trace.1.test
index eae2a55e..ef1cb312 100755
--- a/tests/gentest/trace.1.m4
+++ b/tests/gentest/trace.1.test
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# gentest/trace.1.m4 is part of the GNU m4 testsuite
+# gentest/trace.1.test is part of the GNU m4 testsuite
 # generated from example in ../doc/m4.texinfo line 1705
 
 . ${srcdir}/defs
diff --git a/tests/gentest/translit.1.m4 b/tests/gentest/translit.1.test
index 4ac2bd7a..e650bbdf 100755
--- a/tests/gentest/translit.1.m4
+++ b/tests/gentest/translit.1.test
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# gentest/translit.1.m4 is part of the GNU m4 testsuite
+# gentest/translit.1.test is part of the GNU m4 testsuite
 # generated from example in ../doc/m4.texinfo line 2932
 
 . ${srcdir}/defs
diff --git a/tests/gentest/undefine.1.m4 b/tests/gentest/undefine.1.test
index cd7db2ad..d196e530 100755
--- a/tests/gentest/undefine.1.m4
+++ b/tests/gentest/undefine.1.test
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# gentest/undefine.1.m4 is part of the GNU m4 testsuite
+# gentest/undefine.1.test is part of the GNU m4 testsuite
 # generated from example in ../doc/m4.texinfo line 1186
 
 . ${srcdir}/defs
diff --git a/tests/gentest/undivert.1.m4 b/tests/gentest/undivert.1.test
index db869a32..3d04dc8b 100755
--- a/tests/gentest/undivert.1.m4
+++ b/tests/gentest/undivert.1.test
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# gentest/undivert.1.m4 is part of the GNU m4 testsuite
+# gentest/undivert.1.test is part of the GNU m4 testsuite
 # generated from example in ../doc/m4.texinfo line 2631
 
 . ${srcdir}/defs
diff --git a/tests/gentest/undivert.2.m4 b/tests/gentest/undivert.2.test
index 0663e0dd..6a84ecc4 100755
--- a/tests/gentest/undivert.2.m4
+++ b/tests/gentest/undivert.2.test
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# gentest/undivert.2.m4 is part of the GNU m4 testsuite
+# gentest/undivert.2.test is part of the GNU m4 testsuite
 # generated from example in ../doc/m4.texinfo line 2655
 
 . ${srcdir}/defs
diff --git a/tests/gentest/undivert.3.m4 b/tests/gentest/undivert.3.test
index d0b92cae..f6d22551 100755
--- a/tests/gentest/undivert.3.m4
+++ b/tests/gentest/undivert.3.test
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# gentest/undivert.3.m4 is part of the GNU m4 testsuite
+# gentest/undivert.3.test is part of the GNU m4 testsuite
 # generated from example in ../doc/m4.texinfo line 2681
 
 . ${srcdir}/defs
diff --git a/tests/get-them b/tests/get-them
index e42ec152..0881683c 100755
--- a/tests/get-them
+++ b/tests/get-them
@@ -6,7 +6,7 @@
 
 FILE=${1-/dev/null}
 
-rm -f gentest/*.m4 2>/dev/null
+rm -f gentest/*.test 2>/dev/null
 
 ${AWK-gawk} '
 
@@ -53,7 +53,7 @@ BEGIN {
     error_flag = 0;
     i = 0;
     include_flag = 0;
-    file = sprintf("gentest/%s.%d.m4", node, seq);
+    file = sprintf("gentest/%s.%d.test", node, seq);
     printf ("#!/bin/sh\n\n") > file;
     printf ("# %s is part of the GNU m4 testsuite\n", file) >> file;
     printf ("# generated from example in %s line %d\n\n", FILENAME, NR) >>file;
@@ -111,4 +111,4 @@ function printthem(thearray, thecounter, thefile) {
 
 ' $FILE >/dev/null
 
-chmod +x gentest/*.m4
+chmod +x gentest/*.test