Merge branch 'gawk-4.2-stable' into update-dfa

10 files changed, 82 insertions, 46 deletions

diff --git a/ChangeLog b/ChangeLog
index 341d7f01..3847e183 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2018-10-24         Arnold D. Robbins     <arnold@skeeve.com>
+
+	* main.c (usage): Improve output for -Y and add -Z in the help.
+
+2018-10-23         Arnold D. Robbins     <arnold@skeeve.com>
+
+	* config.sub: Updated from GNULIB.
+
 2018-10-10         Arnold D. Robbins     <arnold@skeeve.com>
 
 	* debug.c (print_instruction): For Op_comment, use print_func
diff --git a/config.sub b/config.sub
index b51fb8cd..f208558e 100755
--- a/config.sub
+++ b/config.sub
@@ -89,7 +89,7 @@ while test $# -gt 0 ; do
     - )	# Use stdin as input.
        break ;;
     -* )
-       echo "$me: invalid option $1$help"
+       echo "$me: invalid option $1$help" >&2
        exit 1 ;;
 
     *local*)
@@ -149,7 +149,7 @@ case $1 in
 		esac
 		;;
 	*-*)
-		# A lone config we happen to match not fitting any patern
+		# A lone config we happen to match not fitting any pattern
 		case $field1-$field2 in
 			decstation-3100)
 				basic_machine=mips-dec
@@ -950,7 +950,7 @@ unset -v basic_machine
 
 # Decode basic machines in the full and proper CPU-Company form.
 case $cpu-$vendor in
-	# Here we handle the default manufacturer of certain CPU types in cannonical form. It is in
+	# Here we handle the default manufacturer of certain CPU types in canonical form. It is in
 	# some cases the only manufacturer, in others, it is the most popular.
 	craynv-unknown)
 		vendor=cray
@@ -1101,7 +1101,7 @@ case $cpu-$vendor in
 		cpu=`echo "$cpu" | sed 's/^xscale/arm/'`
 		;;
 
-	# Recognize the cannonical CPU Types that limit and/or modify the
+	# Recognize the canonical CPU Types that limit and/or modify the
 	# company names they are paired with.
 	cr16-*)
 		os=${os:-elf}
@@ -1150,7 +1150,7 @@ case $cpu-$vendor in
 		;;
 
 	*)
-		# Recognize the cannonical CPU types that are allowed with any
+		# Recognize the canonical CPU types that are allowed with any
 		# company name.
 		case $cpu in
 			1750a | 580 \
diff --git a/doc/ChangeLog b/doc/ChangeLog
index 0872091b..a2f0166b 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,9 @@
+2018-10-23         Arnold D. Robbins     <arnold@skeeve.com>
+
+	* gawktexi.in (Bug address): Mention the GNU Kind
+	Communications Guidelines, with URL.
+	* texinfo.tex: Updated from GNULIB.
+
 2018-09-23         Arnold D. Robbins     <arnold@skeeve.com>
 
 	* gawktexi.in (Extracting): Note that patch levels above
diff --git a/doc/gawk.info b/doc/gawk.info
index 22a696ad..e4bee7ca 100644
--- a/doc/gawk.info
+++ b/doc/gawk.info
@@ -29798,6 +29798,10 @@ questions about things that are unclear in the documentation or are just
 obscure features, ask on the bug list; we will try to help you out if we
 can.
 
+   Please note: We ask that you follow the GNU Kind Communication
+Guidelines (https://gnu.org/philosophy/kind-communication.html) in your
+correspondence on the list (as well as off of it).
+
 
 File: gawk.info,  Node: Usenet,  Next: Maintainers,  Prev: Bug address,  Up: Bugs
 
@@ -36650,39 +36654,39 @@ Node: VMS GNV1198118
 Node: VMS Old Gawk1198853
 Node: Bugs1199324
 Node: Bug address1199987
-Node: Usenet1202779
-Node: Maintainers1203556
-Node: Other Versions1204817
-Node: Installation summary1211375
-Node: Notes1212577
-Node: Compatibility Mode1213371
-Node: Additions1214153
-Node: Accessing The Source1215078
-Node: Adding Code1216515
-Node: New Ports1222734
-Node: Derived Files1227222
-Ref: Derived Files-Footnote-11232868
-Ref: Derived Files-Footnote-21232903
-Ref: Derived Files-Footnote-31233501
-Node: Future Extensions1233615
-Node: Implementation Limitations1234273
-Node: Extension Design1235456
-Node: Old Extension Problems1236600
-Ref: Old Extension Problems-Footnote-11238118
-Node: Extension New Mechanism Goals1238175
-Ref: Extension New Mechanism Goals-Footnote-11241539
-Node: Extension Other Design Decisions1241728
-Node: Extension Future Growth1243841
-Node: Notes summary1244677
-Node: Basic Concepts1245852
-Node: Basic High Level1246533
-Ref: figure-general-flow1246815
-Ref: figure-process-flow1247500
-Ref: Basic High Level-Footnote-11250801
-Node: Basic Data Typing1250986
-Node: Glossary1254314
-Node: Copying1286152
-Node: GNU Free Documentation License1323695
-Node: Index1348815
+Node: Usenet1202969
+Node: Maintainers1203746
+Node: Other Versions1205007
+Node: Installation summary1211565
+Node: Notes1212767
+Node: Compatibility Mode1213561
+Node: Additions1214343
+Node: Accessing The Source1215268
+Node: Adding Code1216705
+Node: New Ports1222924
+Node: Derived Files1227412
+Ref: Derived Files-Footnote-11233058
+Ref: Derived Files-Footnote-21233093
+Ref: Derived Files-Footnote-31233691
+Node: Future Extensions1233805
+Node: Implementation Limitations1234463
+Node: Extension Design1235646
+Node: Old Extension Problems1236790
+Ref: Old Extension Problems-Footnote-11238308
+Node: Extension New Mechanism Goals1238365
+Ref: Extension New Mechanism Goals-Footnote-11241729
+Node: Extension Other Design Decisions1241918
+Node: Extension Future Growth1244031
+Node: Notes summary1244867
+Node: Basic Concepts1246042
+Node: Basic High Level1246723
+Ref: figure-general-flow1247005
+Ref: figure-process-flow1247690
+Ref: Basic High Level-Footnote-11250991
+Node: Basic Data Typing1251176
+Node: Glossary1254504
+Node: Copying1286342
+Node: GNU Free Documentation License1323885
+Node: Index1349005
 
 End Tag Table
diff --git a/doc/gawk.texi b/doc/gawk.texi
index 7ab762c3..7c7cd304 100644
--- a/doc/gawk.texi
+++ b/doc/gawk.texi
@@ -40551,6 +40551,11 @@ Non-bug suggestions are always welcome as well.  If you have questions
 about things that are unclear in the documentation or are just obscure
 features, ask on the bug list; we will try to help you out if we can.
 
+Please note: We ask that you follow the
+@uref{https://gnu.org/philosophy/kind-communication.html,
+GNU Kind Communication Guidelines} in your correspondence on the
+list (as well as off of it).
+
 @node Usenet
 @appendixsubsec Please Don't Post Bug Reports to USENET
 
diff --git a/doc/gawktexi.in b/doc/gawktexi.in
index 568e81eb..a03be9fc 100644
--- a/doc/gawktexi.in
+++ b/doc/gawktexi.in
@@ -39525,6 +39525,11 @@ Non-bug suggestions are always welcome as well.  If you have questions
 about things that are unclear in the documentation or are just obscure
 features, ask on the bug list; we will try to help you out if we can.
 
+Please note: We ask that you follow the
+@uref{https://gnu.org/philosophy/kind-communication.html,
+GNU Kind Communication Guidelines} in your correspondence on the
+list (as well as off of it).
+
 @node Usenet
 @appendixsubsec Please Don't Post Bug Reports to USENET
 
diff --git a/doc/texinfo.tex b/doc/texinfo.tex
index d7f7f53a..5840aff4 100644
--- a/doc/texinfo.tex
+++ b/doc/texinfo.tex
@@ -3,7 +3,7 @@
 % Load plain if necessary, i.e., if running under initex.
 \expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi
 %
-\def\texinfoversion{2018-06-02.09}
+\def\texinfoversion{2018-09-21.20}
 %
 % Copyright 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
 % 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
@@ -8004,6 +8004,7 @@ end
   \gdef\boldbrax{\let(=\opnr\let)=\clnr\let[=\lbrb\let]=\rbrb}
   \gdef\magicamp{\let&=\amprm}
 }
+\let\ampchar\&
 
 \newcount\parencount
 
diff --git a/extension/build-aux/ChangeLog b/extension/build-aux/ChangeLog
index 153c3e21..b23dec0d 100644
--- a/extension/build-aux/ChangeLog
+++ b/extension/build-aux/ChangeLog
@@ -1,3 +1,7 @@
+2018-10-23         Arnold D. Robbins     <arnold@skeeve.com>
+
+	* config.sub: Updated from GNULIB.
+
 2018-09-07         Arnold D. Robbins     <arnold@skeeve.com>
 
 	* config.guess, config.sub: Updated from GNULIB.
diff --git a/extension/build-aux/config.sub b/extension/build-aux/config.sub
index b51fb8cd..f208558e 100755
--- a/extension/build-aux/config.sub
+++ b/extension/build-aux/config.sub
@@ -89,7 +89,7 @@ while test $# -gt 0 ; do
     - )	# Use stdin as input.
        break ;;
     -* )
-       echo "$me: invalid option $1$help"
+       echo "$me: invalid option $1$help" >&2
        exit 1 ;;
 
     *local*)
@@ -149,7 +149,7 @@ case $1 in
 		esac
 		;;
 	*-*)
-		# A lone config we happen to match not fitting any patern
+		# A lone config we happen to match not fitting any pattern
 		case $field1-$field2 in
 			decstation-3100)
 				basic_machine=mips-dec
@@ -950,7 +950,7 @@ unset -v basic_machine
 
 # Decode basic machines in the full and proper CPU-Company form.
 case $cpu-$vendor in
-	# Here we handle the default manufacturer of certain CPU types in cannonical form. It is in
+	# Here we handle the default manufacturer of certain CPU types in canonical form. It is in
 	# some cases the only manufacturer, in others, it is the most popular.
 	craynv-unknown)
 		vendor=cray
@@ -1101,7 +1101,7 @@ case $cpu-$vendor in
 		cpu=`echo "$cpu" | sed 's/^xscale/arm/'`
 		;;
 
-	# Recognize the cannonical CPU Types that limit and/or modify the
+	# Recognize the canonical CPU Types that limit and/or modify the
 	# company names they are paired with.
 	cr16-*)
 		os=${os:-elf}
@@ -1150,7 +1150,7 @@ case $cpu-$vendor in
 		;;
 
 	*)
-		# Recognize the cannonical CPU types that are allowed with any
+		# Recognize the canonical CPU types that are allowed with any
 		# company name.
 		case $cpu in
 			1750a | 580 \
diff --git a/main.c b/main.c
index 9d2b3294..c9591ad3 100644
--- a/main.c
+++ b/main.c
@@ -612,7 +612,10 @@ usage(int exitval, FILE *fp)
 	fputs(_("\t-W nostalgia\t\t--nostalgia\n"), fp);
 #endif
 #ifdef GAWKDEBUG
-	fputs(_("\t-Y\t\t--parsedebug\n"), fp);
+	fputs(_("\t-Y\t\t\t--parsedebug\n"), fp);
+#endif
+#ifdef GAWKDEBUG
+	fputs(_("\t-Z\t\t\t--locale\n"), fp);
 #endif
 
 	/* This is one string to make things easier on translators. */