Merge branch 'gawk-4.1-stable'

5 files changed, 31 insertions, 10 deletions

diff --git a/README.git b/README.git
index 7d0d260c..b5794048 100644
--- a/README.git
+++ b/README.git
@@ -1,4 +1,4 @@
-Sat Dec  1 21:53:02 IST 2012
+Thu Apr 17 16:54:26 IDT 2014
 ============================
 
 If you are reading this, you have retrieved the gawk code base via
@@ -350,3 +350,16 @@ has been pushed up to the Savannah repo or not.
 
 If your branch is completely local to your machine, use `git rebase'.
 Otherwise, use `git merge'.
+
+- How do I remove branches in my local repo that are no longer in the
+  remote repo?
+
+  Either
+  	git fetch --prume
+  or
+  	git remote prune origin
+
+  These remove the remote branches (i.e., origin/something)
+  that no longer exist on the remote.
+
+  (Thanks to Stepan Kasal for this answer.)
diff --git a/doc/ChangeLog b/doc/ChangeLog
index d4f6881b..305062c9 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,8 @@
+2014-04-17         Arnold D. Robbins     <arnold@skeeve.com>
+
+	* gawk.1: Remove the bit about single character programs overflowing
+	the parse stack. It doesn't seem to be true anymore.
+
 2014-04-08         Arnold D. Robbins     <arnold@skeeve.com>
 
 	* 4.1.1: Release tar ball made.
diff --git a/doc/gawk.1 b/doc/gawk.1
index a879b527..e3275e87 100644
--- a/doc/gawk.1
+++ b/doc/gawk.1
@@ -13,7 +13,7 @@
 .		if \w'\(rq' .ds rq "\(rq
 .	\}
 .\}
-.TH GAWK 1 "Mar 08 2014" "Free Software Foundation" "Utility Commands"
+.TH GAWK 1 "Apr 17 2014" "Free Software Foundation" "Utility Commands"
 .SH NAME
 gawk \- pattern scanning and processing language
 .SH SYNOPSIS
@@ -3912,11 +3912,6 @@ The
 .B \-F
 option is not necessary given the command line variable assignment feature;
 it remains only for backwards compatibility.
-.PP
-Syntactically invalid single character programs tend to overflow
-the parse stack, generating a rather unhelpful message.  Such programs
-are surprisingly difficult to diagnose in the completely general case,
-and the effort to do so really is not worth it.
 .SH SEE ALSO
 .IR egrep (1),
 .IR sed (1),
diff --git a/pc/ChangeLog b/pc/ChangeLog
index d8e60c98..a66edae9 100644
--- a/pc/ChangeLog
+++ b/pc/ChangeLog
@@ -1,3 +1,7 @@
+2014-04-17         Scott Deifik  <scottd.mail@sbcglobal.net>
+
+	* Makefile.tst: Add readfile2 test.
+
 2014-04-08         Arnold D. Robbins     <arnold@skeeve.com>
 
 	* 4.1.1: Release tar ball made.
diff --git a/pc/Makefile.tst b/pc/Makefile.tst
index 866b4692..610704e4 100644
--- a/pc/Makefile.tst
+++ b/pc/Makefile.tst
@@ -141,8 +141,7 @@ BASIC_TESTS = \
 	arrayref arrymem1 arryref2 arryref3 arryref4 arryref5 arynasty \
 	arynocls aryprm1 aryprm2 aryprm3 aryprm4 aryprm5 aryprm6 aryprm7 \
 	aryprm8 arysubnm asgext awkpath \
-	back89 backgsub \
-	badassign1 \
+	back89 backgsub badassign1 \
 	childin clobber closebad clsflnam compare compare2 concat1 concat2 \
 	concat3 concat4 convfmt \
 	datanonl defref delargv delarpm2 delarprm delfunc dfamb1 dfastress dynlj \
@@ -211,7 +210,7 @@ LOCALE_CHARSET_TESTS = \
 
 SHLIB_TESTS = \
 	fnmatch filefuncs fork fork2 fts functab4 inplace1 inplace2 inplace3 \
-	ordchr ordchr2 readdir readfile revout revtwoway rwarray testext time
+	ordchr ordchr2 readdir readfile readfile2 revout revtwoway rwarray testext time
 
 # List of the tests which should be run with --lint option:
 NEED_LINT = \
@@ -950,6 +949,11 @@ readfile::
 	@$(AWK) -l readfile 'BEGIN {printf "%s", readfile("Makefile")}' >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
 	@-$(CMP) Makefile _$@ && rm -f _$@ || cp -p Makefile $@.ok
 
+readfile2::
+	@echo $@
+	@$(AWK) -f "$(srcdir)"/$@.awk "$(srcdir)"/$@.awk "$(srcdir)"/readdir.awk > _$@ || echo EXIT CODE: $$? >>_$@
+	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
+
 include2::
 	@echo $@
 	@AWKPATH="$(srcdir)" $(AWK) --include inclib 'BEGIN {print sandwich("a", "b", "c")}' >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@