Merge branch 'gawk-4.1-stable'

6 files changed, 114 insertions, 115 deletions

diff --git a/ChangeLog b/ChangeLog
index 1ae66b63..88bb89da 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2014-10-25         Arnold D. Robbins     <arnold@skeeve.com>
+
+	* dfa.c: Sync with GNU grep.
+
 2014-10-17         John E. Malmberg      <wb8tyw@qsl.net>
 
 	* ext.c (close_extensions): Test for null pointer since
@@ -32,7 +36,7 @@
 
 2014-10-08         Arnold D. Robbins     <arnold@skeeve.com>
 
-	* dfa.c: Sync wit GNU grep.
+	* dfa.c: Sync with GNU grep.
 
 2014-10-05         Arnold D. Robbins     <arnold@skeeve.com>
 
diff --git a/dfa.c b/dfa.c
index f810a262..b71fc283 100644
--- a/dfa.c
+++ b/dfa.c
@@ -3070,17 +3070,7 @@ match_mb_charset (struct dfa *d, state_num s, position pos,
   int context;
 
   /* Check syntax bits.  */
-  if (wc == (wchar_t) eolbyte)
-    {
-      if (!(syntax_bits & RE_DOT_NEWLINE))
-        return 0;
-    }
-  else if (wc == (wchar_t) '\0')
-    {
-      if (syntax_bits & RE_DOT_NOT_NULL)
-        return 0;
-    }
-  else if (wc == WEOF)
+  if (wc == WEOF)
     return 0;
 
   context = wchar_context (wc);
@@ -3410,20 +3400,20 @@ dfaexec_main (struct dfa *d, char const *begin, char *end,
                   continue;
                 }
 
-              /* Falling back to the glibc matcher in this case gives
-                 better performance (up to 25% better on [a-z], for
-                 example) and enables support for collating symbols and
-                 equivalence classes.  */
-              if (d->states[s].has_mbcset && backref)
-                {
-                  *backref = 1;
-                  goto done;
-                }
-
               /* The following code is used twice.
                  Use a macro to avoid the risk that they diverge.  */
 #define State_transition()                                              \
   do {                                                                  \
+              /* Falling back to the glibc matcher in this case gives   \
+                 better performance (up to 25% better on [a-z], for     \
+                 example) and enables support for collating symbols and \
+                 equivalence classes.  */                               \
+              if (d->states[s].has_mbcset && backref)                   \
+                {                                                       \
+                  *backref = 1;                                         \
+                  goto done;                                            \
+                }                                                       \
+                                                                        \
               /* Can match with a multibyte character (and multi-character \
                  collating element).  Transition table might be updated.  */ \
               s = transit_state (d, s, &p, (unsigned char *) end);      \
@@ -3460,6 +3450,7 @@ dfaexec_main (struct dfa *d, char const *begin, char *end,
             {
               while (t[*p] == 0)
                 p++;
+              s1 = 0;
               s = t[*p++];
             }
 
diff --git a/doc/ChangeLog b/doc/ChangeLog
index 4b63a290..58e62c36 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,7 @@
+2014-10-25         Arnold D. Robbins     <arnold@skeeve.com>
+
+	* gawktexi.in: Minor typo fixes.
+
 2014-10-17         Arnold D. Robbins     <arnold@skeeve.com>
 
 	* gawktexi.in: Fix date in docbook attribution for new Foreword;
diff --git a/doc/gawk.info b/doc/gawk.info
index 9b2131c5..ee73b940 100644
--- a/doc/gawk.info
+++ b/doc/gawk.info
@@ -25760,8 +25760,8 @@ returned as a record.
 number and the file name, separated by a forward slash character.  On
 systems where the directory entry contains the file type, the record
 has a third field (also separated by a slash) which is a single letter
-indicating the type of the file. The letters are file types are shown
-in *note table-readdir-file-types::.
+indicating the type of the file. The letters and their corresponding
+file types are shown in *note table-readdir-file-types::.
 
 Letter  File Type
 -------------------------------------------------------------------------- 
@@ -26865,7 +26865,7 @@ in POSIX `awk', in the order they were added to `gawk'.
 
         - The `-M' and `--bignum' options enable MPFR.
 
-        - The `-o' only does pretty-printing.
+        - The `-o' option only does pretty-printing.
 
         - The `-p' option is used for profiling.
 
@@ -34830,89 +34830,89 @@ Node: Extension Sample Fork1032656
 Node: Extension Sample Inplace1033869
 Node: Extension Sample Ord1035544
 Node: Extension Sample Readdir1036380
-Ref: table-readdir-file-types1037236
-Node: Extension Sample Revout1038047
-Node: Extension Sample Rev2way1038638
-Node: Extension Sample Read write array1039379
-Node: Extension Sample Readfile1041318
-Node: Extension Sample Time1042413
-Node: Extension Sample API Tests1043762
-Node: gawkextlib1044253
-Node: Extension summary1046903
-Node: Extension Exercises1050585
-Node: Language History1051307
-Node: V7/SVR3.11052964
-Node: SVR41055145
-Node: POSIX1056590
-Node: BTL1057979
-Node: POSIX/GNU1058713
-Node: Feature History1064342
-Node: Common Extensions1077433
-Node: Ranges and Locales1078757
-Ref: Ranges and Locales-Footnote-11083396
-Ref: Ranges and Locales-Footnote-21083423
-Ref: Ranges and Locales-Footnote-31083657
-Node: Contributors1083878
-Node: History summary1089418
-Node: Installation1090787
-Node: Gawk Distribution1091743
-Node: Getting1092227
-Node: Extracting1093051
-Node: Distribution contents1094693
-Node: Unix Installation1100463
-Node: Quick Installation1101080
-Node: Additional Configuration Options1103511
-Node: Configuration Philosophy1105251
-Node: Non-Unix Installation1107602
-Node: PC Installation1108060
-Node: PC Binary Installation1109386
-Node: PC Compiling1111234
-Ref: PC Compiling-Footnote-11114255
-Node: PC Testing1114360
-Node: PC Using1115536
-Node: Cygwin1119651
-Node: MSYS1120474
-Node: VMS Installation1120972
-Node: VMS Compilation1121764
-Ref: VMS Compilation-Footnote-11122986
-Node: VMS Dynamic Extensions1123044
-Node: VMS Installation Details1124728
-Node: VMS Running1126980
-Node: VMS GNV1129821
-Node: VMS Old Gawk1130555
-Node: Bugs1131025
-Node: Other Versions1134929
-Node: Installation summary1141142
-Node: Notes1142198
-Node: Compatibility Mode1143063
-Node: Additions1143845
-Node: Accessing The Source1144770
-Node: Adding Code1146206
-Node: New Ports1152378
-Node: Derived Files1156860
-Ref: Derived Files-Footnote-11162335
-Ref: Derived Files-Footnote-21162369
-Ref: Derived Files-Footnote-31162965
-Node: Future Extensions1163079
-Node: Implementation Limitations1163685
-Node: Extension Design1164933
-Node: Old Extension Problems1166087
-Ref: Old Extension Problems-Footnote-11167604
-Node: Extension New Mechanism Goals1167661
-Ref: Extension New Mechanism Goals-Footnote-11171021
-Node: Extension Other Design Decisions1171210
-Node: Extension Future Growth1173318
-Node: Old Extension Mechanism1174154
-Node: Notes summary1175916
-Node: Basic Concepts1177102
-Node: Basic High Level1177783
-Ref: figure-general-flow1178055
-Ref: figure-process-flow1178654
-Ref: Basic High Level-Footnote-11181883
-Node: Basic Data Typing1182068
-Node: Glossary1185396
-Node: Copying1210554
-Node: GNU Free Documentation License1248110
-Node: Index1273246
+Ref: table-readdir-file-types1037256
+Node: Extension Sample Revout1038067
+Node: Extension Sample Rev2way1038658
+Node: Extension Sample Read write array1039399
+Node: Extension Sample Readfile1041338
+Node: Extension Sample Time1042433
+Node: Extension Sample API Tests1043782
+Node: gawkextlib1044273
+Node: Extension summary1046923
+Node: Extension Exercises1050605
+Node: Language History1051327
+Node: V7/SVR3.11052984
+Node: SVR41055165
+Node: POSIX1056610
+Node: BTL1057999
+Node: POSIX/GNU1058733
+Node: Feature History1064362
+Node: Common Extensions1077460
+Node: Ranges and Locales1078784
+Ref: Ranges and Locales-Footnote-11083423
+Ref: Ranges and Locales-Footnote-21083450
+Ref: Ranges and Locales-Footnote-31083684
+Node: Contributors1083905
+Node: History summary1089445
+Node: Installation1090814
+Node: Gawk Distribution1091770
+Node: Getting1092254
+Node: Extracting1093078
+Node: Distribution contents1094720
+Node: Unix Installation1100490
+Node: Quick Installation1101107
+Node: Additional Configuration Options1103538
+Node: Configuration Philosophy1105278
+Node: Non-Unix Installation1107629
+Node: PC Installation1108087
+Node: PC Binary Installation1109413
+Node: PC Compiling1111261
+Ref: PC Compiling-Footnote-11114282
+Node: PC Testing1114387
+Node: PC Using1115563
+Node: Cygwin1119678
+Node: MSYS1120501
+Node: VMS Installation1120999
+Node: VMS Compilation1121791
+Ref: VMS Compilation-Footnote-11123013
+Node: VMS Dynamic Extensions1123071
+Node: VMS Installation Details1124755
+Node: VMS Running1127007
+Node: VMS GNV1129848
+Node: VMS Old Gawk1130582
+Node: Bugs1131052
+Node: Other Versions1134956
+Node: Installation summary1141169
+Node: Notes1142225
+Node: Compatibility Mode1143090
+Node: Additions1143872
+Node: Accessing The Source1144797
+Node: Adding Code1146233
+Node: New Ports1152405
+Node: Derived Files1156887
+Ref: Derived Files-Footnote-11162362
+Ref: Derived Files-Footnote-21162396
+Ref: Derived Files-Footnote-31162992
+Node: Future Extensions1163106
+Node: Implementation Limitations1163712
+Node: Extension Design1164960
+Node: Old Extension Problems1166114
+Ref: Old Extension Problems-Footnote-11167631
+Node: Extension New Mechanism Goals1167688
+Ref: Extension New Mechanism Goals-Footnote-11171048
+Node: Extension Other Design Decisions1171237
+Node: Extension Future Growth1173345
+Node: Old Extension Mechanism1174181
+Node: Notes summary1175943
+Node: Basic Concepts1177129
+Node: Basic High Level1177810
+Ref: figure-general-flow1178082
+Ref: figure-process-flow1178681
+Ref: Basic High Level-Footnote-11181910
+Node: Basic Data Typing1182095
+Node: Glossary1185423
+Node: Copying1210581
+Node: GNU Free Documentation License1248137
+Node: Index1273273
 
 End Tag Table
diff --git a/doc/gawk.texi b/doc/gawk.texi
index 2603228f..e43415dc 100644
--- a/doc/gawk.texi
+++ b/doc/gawk.texi
@@ -34896,8 +34896,8 @@ The record consists of three fields. The first two are the inode number and the
 @value{FN}, separated by a forward slash character.
 On systems where the directory entry contains the file type, the record
 has a third field (also separated by a slash) which is a single letter
-indicating the type of the file. The letters are file types are shown
-in @ref{table-readdir-file-types}.
+indicating the type of the file. The letters and their corresponding file
+types are shown in @ref{table-readdir-file-types}.
 
 @float Table,table-readdir-file-types
 @caption{File Types Returned By The @code{readdir} Extension}
@@ -36578,7 +36578,7 @@ The @option{-l} and @option{--load} options load compiled dynamic extensions.
 The @option{-M} and @option{--bignum} options enable MPFR.
 
 @item
-The @option{-o} only does pretty-printing.
+The @option{-o} option only does pretty-printing.
 
 @item
 The @option{-p} option is used for profiling.
diff --git a/doc/gawktexi.in b/doc/gawktexi.in
index 9234232f..e2e2a034 100644
--- a/doc/gawktexi.in
+++ b/doc/gawktexi.in
@@ -34006,8 +34006,8 @@ The record consists of three fields. The first two are the inode number and the
 @value{FN}, separated by a forward slash character.
 On systems where the directory entry contains the file type, the record
 has a third field (also separated by a slash) which is a single letter
-indicating the type of the file. The letters are file types are shown
-in @ref{table-readdir-file-types}.
+indicating the type of the file. The letters and their corresponding file
+types are shown in @ref{table-readdir-file-types}.
 
 @float Table,table-readdir-file-types
 @caption{File Types Returned By The @code{readdir} Extension}
@@ -35688,7 +35688,7 @@ The @option{-l} and @option{--load} options load compiled dynamic extensions.
 The @option{-M} and @option{--bignum} options enable MPFR.
 
 @item
-The @option{-o} only does pretty-printing.
+The @option{-o} option only does pretty-printing.
 
 @item
 The @option{-p} option is used for profiling.