Merge branch 'gawk-4.1-stable' of ssh://git.sv.gnu.org/srv/git/gawk into gawk-4.1-stable

10 files changed, 177 insertions, 134 deletions

diff --git a/ChangeLog b/ChangeLog
index f370fdc9..9ac5be64 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2016-08-01         Arnold D. Robbins     <arnold@skeeve.com>
+
+	* README, NEWS: Mark DJGPP port as unsupported.
+
 2016-08-01         Andrew J. Schorr     <aschorr@telemetry-investments.com>
 
 	* mpfr.c (mpg_tofloat): Always set precision to avoid hysteresis effects
@@ -9,10 +13,23 @@
 	setting in effect.
 	(init_mpfr, set_PREC): Save mpfr_set_default_prec argument in
 	default_prec.
-	(do_mpfr_func): If the argument's precision exceeds the default precision,
-	boost the result's precision to match it. This fixes a bug where
-	we used to copy the argument's precision, regardless of whether it
-	was higher or lower than the PREC setting.
+	(do_mpfr_func): If the argument's precision exceeds the default
+	precision, boost the result's precision to match it. This fixes a
+	bug where we used to copy the argument's precision, regardless of
+	whether it was higher or lower than the PREC setting.
+
+2016-07-24         Norihiro Tanaka      <noritnk@kcn.ne.jp>
+
+	* re.c (research): Now that the dfa matcher correctly runs even
+	in multibyte locales, try it if even if need_start is true.
+	However, if start > 0, avoid dfa matcher, since it can't handle
+	the case where the search starts in the middle of a string.
+
+	Unrelated:
+
+	* eval.c (load_casetable): Reset casetable[i] to `i' if i
+	should not be mapped to upper case. Fixes inconsistencies between
+	dfa and regex in some single bytes locales; notably el_GR.iso88597.
 
 2016-07-23         Andrew J. Schorr     <aschorr@telemetry-investments.com>
 
diff --git a/NEWS b/NEWS
index ca891f8b..c149dfd7 100644
--- a/NEWS
+++ b/NEWS
@@ -44,7 +44,9 @@ Changes from 4.1.3 to 4.1.4
 13. A new environment variable GAWK_LOCALE_DIR may be set to locate the .mo
     file for gawk itself.
 
-14. A number of bugs have been fixed. See the ChangeLog.
+14. The DJGPP port is now officially deprecated.
+
+15. A number of bugs have been fixed. See the ChangeLog.
 
 Changes from 4.1.2 to 4.1.3
 ---------------------------
diff --git a/README b/README
index b8add239..57e6c32c 100644
--- a/README
+++ b/README
@@ -80,7 +80,7 @@ Arnold Robbins
 
 BUG REPORTS AND FIXES, non-Unix systems:
 
-MS-DOS with DJGPP:
+MS-DOS with DJGPP: (This port is deprecated.)
 	Scott Deifik
 	scottd.mail@sbcglobal.net
 
diff --git a/doc/ChangeLog b/doc/ChangeLog
index 709992f8..deb45a45 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,11 @@
+2016-08-01         Arnold D. Robbins     <arnold@skeeve.com>
+
+	* gawktexi.in: Mark DJGPP port as unsupported.
+
+2016-07-24         Arnold D. Robbins     <arnold@skeeve.com>
+
+	* gawktexi.in: Fix a typo. Thanks to Marco Curreli for reporting.
+
 2016-07-18         Arnold D. Robbins     <arnold@skeeve.com>
 
 	* gawktexi.in: Fix a typo. Thanks to Antonio Colombo for reporting.
diff --git a/doc/gawk.info b/doc/gawk.info
index f4759a08..da03f15d 100644
--- a/doc/gawk.info
+++ b/doc/gawk.info
@@ -26230,7 +26230,7 @@ File: gawk.info,  Node: Extension Exercises,  Prev: Extension summary,  Up: Dyna
      the input file is a terminal.  (Hint: this function is usually
      expensive to call; try to call it just once.)  The content of the
      prompt should come from a variable settable by 'awk'-level code.
-     You can write the prompt to stanard error.  However, for best
+     You can write the prompt to standard error.  However, for best
      results, open a new file descriptor (or file pointer) on '/dev/tty'
      and print the prompt there, in case standard error has been
      redirected.
@@ -27181,7 +27181,7 @@ Info file, in approximate chronological order:
    * Fred Fish provided the port to Amiga systems and its documentation.
      (With Fred's sad passing, this is no longer supported.)
 
-   * Scott Deifik currently maintains the MS-DOS port using DJGPP.
+   * Scott Deifik maintained the MS-DOS port using DJGPP.
 
    * Eli Zaretskii currently maintains the MS-Windows port using MinGW.
 
@@ -27832,8 +27832,7 @@ File: gawk.info,  Node: PC Compiling,  Next: PC Testing,  Prev: PC Binary Instal
 B.3.1.2 Compiling 'gawk' for PC Operating Systems
 .................................................
 
-'gawk' can be compiled for MS-DOS, Windows32, and OS/2 using the GNU
-development tools from DJ Delorie (DJGPP: MS-DOS only), MinGW
+'gawk' can be compiled for MS-DOS, Windows32, and OS/2 using MinGW
 (Windows32) or Eberhard Mattes (EMX: MS-DOS, Windows32 and OS/2).  The
 file 'README_d/README.pc' in the 'gawk' distribution contains additional
 notes, and 'pc/Makefile' contains important information on compilation
@@ -27848,11 +27847,9 @@ be edited in order to work with your 'make' utility.
 
    The 'Makefile' supports a number of targets for building various
 MS-DOS and Windows32 versions.  A list of targets is printed if the
-'make' command is given without a target.  As an example, to build
-'gawk' using the DJGPP tools, enter 'make djgpp'.  (The DJGPP tools
-needed for the build may be found at
-<ftp://ftp.delorie.com/pub/djgpp/current/v2gnu/>.)  To build a native
-MS-Windows binary of 'gawk' using the MinGW tools, type 'make mingw32'.
+'make' command is given without a target.  As an example, to build a
+native MS-Windows binary of 'gawk' using the MinGW tools, type 'make
+mingw32'.
 
    The 32 bit EMX version of 'gawk' works "out of the box" under OS/2.
 However, it is highly recommended to use GCC 2.95.3 for the compilation.
@@ -27961,7 +27958,7 @@ is set to 'e:' the complete default search path is
 
    An 'sh'-like shell (as opposed to 'command.com' under MS-DOS or
 'cmd.exe' under MS-Windows or OS/2) may be useful for 'awk' programming.
-The DJGPP collection of tools includes an MS-DOS port of Bash, and
+The DJGPP collection of tools(1) includes an MS-DOS port of Bash, and
 several shells are available for OS/2, including 'ksh'.
 
    Under MS-Windows, OS/2 and MS-DOS, 'gawk' (and many other text
@@ -28023,6 +28020,10 @@ or:
 With proper quoting, in the first example the setting of 'RS' can be
 moved into the 'BEGIN' rule.
 
+   ---------- Footnotes ----------
+
+   (1) Available from <ftp://ftp.delorie.com/pub/djgpp/current/v2gnu/>.
+
 
 File: gawk.info,  Node: Cygwin,  Next: MSYS,  Prev: PC Using,  Up: PC Installation
 
@@ -28439,8 +28440,6 @@ this Info file.
 
 Unix and POSIX          Arnold Robbins, <arnold@skeeve.com>
 systems                 
-MS-DOS with DJGPP       Scott Deifik, <scottd.mail@sbcglobal.net>
-                        
 MS-Windows with MinGW   Eli Zaretskii, <eliz@gnu.org>
                         
 OS/2                    Andreas Buening, <andreas.buening@nexgo.de>
@@ -28453,6 +28452,10 @@ z/OS (OS/390)           Daniel Richard G. <skunk@iSKUNK.ORG>
    If your bug is also reproducible under Unix, send a copy of your
 report to the <bug-gawk@gnu.org> email list as well.
 
+   The DJGPP port is no longer supported; it will remain in the code
+base for a while in case a volunteer wishes to take it over.  If this
+does not happen, then eventually code for this port will be removed.
+
 
 File: gawk.info,  Node: Other Versions,  Next: Installation summary,  Prev: Bugs,  Up: Installation
 
@@ -28624,9 +28627,9 @@ B.6 Summary
           ./configure && make && make check
 
    * 'gawk' may be built on non-POSIX systems as well.  The currently
-     supported systems are MS-Windows using DJGPP, MSYS, MinGW, and
-     Cygwin, OS/2 using EMX, and both Vax/VMS and OpenVMS. Instructions
-     for each system are included in this major node.
+     supported systems are MS-Windows using MSYS, MinGW, and Cygwin,
+     OS/2 using EMX, and both Vax/VMS and OpenVMS. Instructions for each
+     system are included in this major node.
 
    * Bug reports should be sent via email to <bug-gawk@gnu.org>.  Bug
      reports should be in English and should include the version of
@@ -32401,9 +32404,9 @@ Index
 * compiled programs:                     Basic High Level.    (line  13)
 * compiled programs <1>:                 Glossary.            (line 218)
 * compiling gawk for Cygwin:             Cygwin.              (line   6)
-* compiling gawk for MS-DOS and MS-Windows: PC Compiling.     (line  13)
+* compiling gawk for MS-DOS and MS-Windows: PC Compiling.     (line  12)
 * compiling gawk for VMS:                VMS Compilation.     (line   6)
-* compiling gawk with EMX for OS/2:      PC Compiling.        (line  28)
+* compiling gawk with EMX for OS/2:      PC Compiling.        (line  25)
 * compl:                                 Bitwise Functions.   (line  44)
 * complement, bitwise:                   Bitwise Functions.   (line  25)
 * compound statements, control statements and: Statements.    (line  10)
@@ -35193,79 +35196,80 @@ Node: Extension Sample API Tests1052991
 Node: gawkextlib1053483
 Node: Extension summary1055907
 Node: Extension Exercises1059599
-Node: Language History1061096
-Node: V7/SVR3.11062752
-Node: SVR41064904
-Node: POSIX1066338
-Node: BTL1067717
-Node: POSIX/GNU1068446
-Node: Feature History1073967
-Node: Common Extensions1087296
-Node: Ranges and Locales1088579
-Ref: Ranges and Locales-Footnote-11093195
-Ref: Ranges and Locales-Footnote-21093222
-Ref: Ranges and Locales-Footnote-31093457
-Node: Contributors1093678
-Node: History summary1099247
-Node: Installation1100627
-Node: Gawk Distribution1101571
-Node: Getting1102055
-Node: Extracting1103016
-Node: Distribution contents1104654
-Node: Unix Installation1110405
-Node: Quick Installation1111021
-Node: Additional Configuration Options1113448
-Node: Configuration Philosophy1115252
-Node: Non-Unix Installation1117621
-Node: PC Installation1118079
-Node: PC Binary Installation1119399
-Node: PC Compiling1121251
-Ref: PC Compiling-Footnote-11124275
-Node: PC Testing1124384
-Node: PC Using1125564
-Node: Cygwin1129678
-Node: MSYS1130448
-Node: VMS Installation1130949
-Node: VMS Compilation1131740
-Ref: VMS Compilation-Footnote-11132969
-Node: VMS Dynamic Extensions1133027
-Node: VMS Installation Details1134712
-Node: VMS Running1136965
-Node: VMS GNV1141244
-Node: VMS Old Gawk1141979
-Node: Bugs1142450
-Node: Other Versions1146647
-Node: Installation summary1153231
-Node: Notes1154289
-Node: Compatibility Mode1155154
-Node: Additions1155936
-Node: Accessing The Source1156861
-Node: Adding Code1158296
-Node: New Ports1164515
-Node: Derived Files1169003
-Ref: Derived Files-Footnote-11174488
-Ref: Derived Files-Footnote-21174523
-Ref: Derived Files-Footnote-31175121
-Node: Future Extensions1175235
-Node: Implementation Limitations1175893
-Node: Extension Design1177076
-Node: Old Extension Problems1178230
-Ref: Old Extension Problems-Footnote-11179748
-Node: Extension New Mechanism Goals1179805
-Ref: Extension New Mechanism Goals-Footnote-11183169
-Node: Extension Other Design Decisions1183358
-Node: Extension Future Growth1185471
-Node: Old Extension Mechanism1186307
-Node: Notes summary1188070
-Node: Basic Concepts1189252
-Node: Basic High Level1189933
-Ref: figure-general-flow1190215
-Ref: figure-process-flow1190900
-Ref: Basic High Level-Footnote-11194201
-Node: Basic Data Typing1194386
-Node: Glossary1197714
-Node: Copying1229660
-Node: GNU Free Documentation License1267199
-Node: Index1292317
+Node: Language History1061097
+Node: V7/SVR3.11062753
+Node: SVR41064905
+Node: POSIX1066339
+Node: BTL1067718
+Node: POSIX/GNU1068447
+Node: Feature History1073968
+Node: Common Extensions1087297
+Node: Ranges and Locales1088580
+Ref: Ranges and Locales-Footnote-11093196
+Ref: Ranges and Locales-Footnote-21093223
+Ref: Ranges and Locales-Footnote-31093458
+Node: Contributors1093679
+Node: History summary1099239
+Node: Installation1100619
+Node: Gawk Distribution1101563
+Node: Getting1102047
+Node: Extracting1103008
+Node: Distribution contents1104646
+Node: Unix Installation1110397
+Node: Quick Installation1111013
+Node: Additional Configuration Options1113440
+Node: Configuration Philosophy1115244
+Node: Non-Unix Installation1117613
+Node: PC Installation1118071
+Node: PC Binary Installation1119391
+Node: PC Compiling1121243
+Ref: PC Compiling-Footnote-11124037
+Node: PC Testing1124146
+Node: PC Using1125326
+Ref: PC Using-Footnote-11129479
+Node: Cygwin1129552
+Node: MSYS1130322
+Node: VMS Installation1130823
+Node: VMS Compilation1131614
+Ref: VMS Compilation-Footnote-11132843
+Node: VMS Dynamic Extensions1132901
+Node: VMS Installation Details1134586
+Node: VMS Running1136839
+Node: VMS GNV1141118
+Node: VMS Old Gawk1141853
+Node: Bugs1142324
+Node: Other Versions1146639
+Node: Installation summary1153223
+Node: Notes1154274
+Node: Compatibility Mode1155139
+Node: Additions1155921
+Node: Accessing The Source1156846
+Node: Adding Code1158281
+Node: New Ports1164500
+Node: Derived Files1168988
+Ref: Derived Files-Footnote-11174473
+Ref: Derived Files-Footnote-21174508
+Ref: Derived Files-Footnote-31175106
+Node: Future Extensions1175220
+Node: Implementation Limitations1175878
+Node: Extension Design1177061
+Node: Old Extension Problems1178215
+Ref: Old Extension Problems-Footnote-11179733
+Node: Extension New Mechanism Goals1179790
+Ref: Extension New Mechanism Goals-Footnote-11183154
+Node: Extension Other Design Decisions1183343
+Node: Extension Future Growth1185456
+Node: Old Extension Mechanism1186292
+Node: Notes summary1188055
+Node: Basic Concepts1189237
+Node: Basic High Level1189918
+Ref: figure-general-flow1190200
+Ref: figure-process-flow1190885
+Ref: Basic High Level-Footnote-11194186
+Node: Basic Data Typing1194371
+Node: Glossary1197699
+Node: Copying1229645
+Node: GNU Free Documentation License1267184
+Node: Index1292302
 
 End Tag Table
diff --git a/doc/gawk.texi b/doc/gawk.texi
index 42d103e5..99b77fa8 100644
--- a/doc/gawk.texi
+++ b/doc/gawk.texi
@@ -35313,7 +35313,7 @@ function to tell if the input file is a terminal. (Hint: this function
 is usually expensive to call; try to call it just once.)
 The content of the prompt should come from a variable settable
 by @command{awk}-level code.
-You can write the prompt to stanard error. However,
+You can write the prompt to standard error. However,
 for best results, open a new file descriptor (or file pointer)
 on @file{/dev/tty} and print the prompt there, in case standard
 error has been redirected.
@@ -36842,14 +36842,13 @@ provided the port to Amiga systems and its documentation.
 @item
 @cindex Deifik, Scott
 Scott Deifik
-currently maintains the MS-DOS port using DJGPP.
+maintained the MS-DOS port using DJGPP.
 
 @item
 @cindex Zaretskii, Eli
 Eli Zaretskii
 currently maintains the MS-Windows port using MinGW.
 
-
 @item
 @cindex Grigera, Juan
 Juan Grigera
@@ -37639,13 +37638,13 @@ or more detailed installation instructions.
 @appendixsubsubsec Compiling @command{gawk} for PC Operating Systems
 
 @ifclear FOR_PRINT
-@command{gawk} can be compiled for MS-DOS, Windows32, and OS/2 using the GNU
-development tools from DJ Delorie (DJGPP: MS-DOS only), MinGW (Windows32) or Eberhard
+@command{gawk} can be compiled for MS-DOS, Windows32, and OS/2 using
+MinGW (Windows32) or Eberhard
 Mattes (EMX: MS-DOS, Windows32 and OS/2).
 @end ifclear
 @ifset FOR_PRINT
-@command{gawk} can be compiled for MS-DOS and Windows32 using the GNU
-development tools from DJ Delorie (DJGPP: MS-DOS only) or MinGW (Windows32).
+@command{gawk} can be compiled for Windows32 using
+MinGW.
 @end ifset
 The file
 @file{README_d/README.pc} in the @command{gawk} distribution contains
@@ -37663,10 +37662,8 @@ to be edited in order to work with your @command{make} utility.
 
 The @file{Makefile} supports a number of targets for building various
 MS-DOS and Windows32 versions.  A list of targets is printed if the
-@command{make} command is given without a target.  As an example, to
-build @command{gawk} using the DJGPP tools, enter @samp{make djgpp}.
-(The DJGPP tools needed for the build may be found at
-@uref{ftp://ftp.delorie.com/pub/djgpp/current/v2gnu/}.)  To build a
+@command{make} command is given without a target.  As an example,
+to build a
 native MS-Windows binary of @command{gawk} using the MinGW tools,
 type @samp{make mingw32}.
 
@@ -37815,13 +37812,16 @@ E.g., if @env{UNIXROOT} is set to @file{e:} the complete default search path is
 
 An @command{sh}-like shell (as opposed to @command{command.com} under MS-DOS
 or @command{cmd.exe} under MS-Windows or OS/2) may be useful for @command{awk} programming.
-The DJGPP collection of tools includes an MS-DOS port of Bash,
+The DJGPP collection of tools@footnote{Available from
+@uref{ftp://ftp.delorie.com/pub/djgpp/current/v2gnu/}.}
+includes an MS-DOS port of Bash,
 and several shells are available for OS/2, including @command{ksh}.
 @end ifclear
 @ifset FOR_PRINT
 An @command{sh}-like shell (as opposed to @command{command.com} under MS-DOS
 or @command{cmd.exe} under MS-Windows) may be useful for @command{awk} programming.
-The DJGPP collection of tools includes an MS-DOS port of Bash.
+The DJGPP collection of tools@footnote{Available from
+@uref{ftp://ftp.delorie.com/pub/djgpp/current/v2gnu/}.} includes an MS-DOS port of Bash.
 @end ifset
 
 @cindex common extensions, @code{BINMODE} variable
@@ -38448,7 +38448,7 @@ The people maintaining the various @command{gawk} ports are:
 @multitable {MS-Windows with MinGW} {123456789012345678901234567890123456789001234567890}
 @item Unix and POSIX systems @tab Arnold Robbins, @EMAIL{arnold@@skeeve.com,arnold at skeeve dot com}
 
-@item MS-DOS with DJGPP @tab Scott Deifik, @EMAIL{scottd.mail@@sbcglobal.net,scottd dot mail at sbcglobal dot net}
+@c @item MS-DOS with DJGPP @tab Scott Deifik, @EMAIL{scottd.mail@@sbcglobal.net,scottd dot mail at sbcglobal dot net}
 
 @item MS-Windows with MinGW @tab Eli Zaretskii, @EMAIL{eliz@@gnu.org,eliz at gnu dot org}
 
@@ -38465,6 +38465,10 @@ The people maintaining the various @command{gawk} ports are:
 If your bug is also reproducible under Unix, send a copy of your
 report to the @EMAIL{bug-gawk@@gnu.org,bug-gawk at gnu dot org} email list as well.
 
+The DJGPP port is no longer supported; it will remain in the code base for a while in case
+a volunteer wishes to take it over. If this does not happen, then eventually code for this
+port will be removed.
+
 @node Other Versions
 @appendixsec Other Freely Available @command{awk} Implementations
 @cindex @command{awk}, implementations
@@ -38707,7 +38711,8 @@ cd gawk-@value{VERSION}.@value{PATCHLEVEL}
 
 @item
 @command{gawk} may be built on non-POSIX systems as well. The currently
-supported systems are MS-Windows using DJGPP, MSYS, MinGW, and Cygwin,
+supported systems are MS-Windows using
+MSYS, MinGW, and Cygwin,
 @ifclear FOR_PRINT
 OS/2 using EMX,
 @end ifclear
diff --git a/doc/gawktexi.in b/doc/gawktexi.in
index 9714f1a4..83ee9a19 100644
--- a/doc/gawktexi.in
+++ b/doc/gawktexi.in
@@ -34404,7 +34404,7 @@ function to tell if the input file is a terminal. (Hint: this function
 is usually expensive to call; try to call it just once.)
 The content of the prompt should come from a variable settable
 by @command{awk}-level code.
-You can write the prompt to stanard error. However,
+You can write the prompt to standard error. However,
 for best results, open a new file descriptor (or file pointer)
 on @file{/dev/tty} and print the prompt there, in case standard
 error has been redirected.
@@ -35933,14 +35933,13 @@ provided the port to Amiga systems and its documentation.
 @item
 @cindex Deifik, Scott
 Scott Deifik
-currently maintains the MS-DOS port using DJGPP.
+maintained the MS-DOS port using DJGPP.
 
 @item
 @cindex Zaretskii, Eli
 Eli Zaretskii
 currently maintains the MS-Windows port using MinGW.
 
-
 @item
 @cindex Grigera, Juan
 Juan Grigera
@@ -36730,13 +36729,13 @@ or more detailed installation instructions.
 @appendixsubsubsec Compiling @command{gawk} for PC Operating Systems
 
 @ifclear FOR_PRINT
-@command{gawk} can be compiled for MS-DOS, Windows32, and OS/2 using the GNU
-development tools from DJ Delorie (DJGPP: MS-DOS only), MinGW (Windows32) or Eberhard
+@command{gawk} can be compiled for MS-DOS, Windows32, and OS/2 using
+MinGW (Windows32) or Eberhard
 Mattes (EMX: MS-DOS, Windows32 and OS/2).
 @end ifclear
 @ifset FOR_PRINT
-@command{gawk} can be compiled for MS-DOS and Windows32 using the GNU
-development tools from DJ Delorie (DJGPP: MS-DOS only) or MinGW (Windows32).
+@command{gawk} can be compiled for Windows32 using
+MinGW.
 @end ifset
 The file
 @file{README_d/README.pc} in the @command{gawk} distribution contains
@@ -36754,10 +36753,8 @@ to be edited in order to work with your @command{make} utility.
 
 The @file{Makefile} supports a number of targets for building various
 MS-DOS and Windows32 versions.  A list of targets is printed if the
-@command{make} command is given without a target.  As an example, to
-build @command{gawk} using the DJGPP tools, enter @samp{make djgpp}.
-(The DJGPP tools needed for the build may be found at
-@uref{ftp://ftp.delorie.com/pub/djgpp/current/v2gnu/}.)  To build a
+@command{make} command is given without a target.  As an example,
+to build a
 native MS-Windows binary of @command{gawk} using the MinGW tools,
 type @samp{make mingw32}.
 
@@ -36906,13 +36903,16 @@ E.g., if @env{UNIXROOT} is set to @file{e:} the complete default search path is
 
 An @command{sh}-like shell (as opposed to @command{command.com} under MS-DOS
 or @command{cmd.exe} under MS-Windows or OS/2) may be useful for @command{awk} programming.
-The DJGPP collection of tools includes an MS-DOS port of Bash,
+The DJGPP collection of tools@footnote{Available from
+@uref{ftp://ftp.delorie.com/pub/djgpp/current/v2gnu/}.}
+includes an MS-DOS port of Bash,
 and several shells are available for OS/2, including @command{ksh}.
 @end ifclear
 @ifset FOR_PRINT
 An @command{sh}-like shell (as opposed to @command{command.com} under MS-DOS
 or @command{cmd.exe} under MS-Windows) may be useful for @command{awk} programming.
-The DJGPP collection of tools includes an MS-DOS port of Bash.
+The DJGPP collection of tools@footnote{Available from
+@uref{ftp://ftp.delorie.com/pub/djgpp/current/v2gnu/}.} includes an MS-DOS port of Bash.
 @end ifset
 
 @cindex common extensions, @code{BINMODE} variable
@@ -37539,7 +37539,7 @@ The people maintaining the various @command{gawk} ports are:
 @multitable {MS-Windows with MinGW} {123456789012345678901234567890123456789001234567890}
 @item Unix and POSIX systems @tab Arnold Robbins, @EMAIL{arnold@@skeeve.com,arnold at skeeve dot com}
 
-@item MS-DOS with DJGPP @tab Scott Deifik, @EMAIL{scottd.mail@@sbcglobal.net,scottd dot mail at sbcglobal dot net}
+@c @item MS-DOS with DJGPP @tab Scott Deifik, @EMAIL{scottd.mail@@sbcglobal.net,scottd dot mail at sbcglobal dot net}
 
 @item MS-Windows with MinGW @tab Eli Zaretskii, @EMAIL{eliz@@gnu.org,eliz at gnu dot org}
 
@@ -37556,6 +37556,10 @@ The people maintaining the various @command{gawk} ports are:
 If your bug is also reproducible under Unix, send a copy of your
 report to the @EMAIL{bug-gawk@@gnu.org,bug-gawk at gnu dot org} email list as well.
 
+The DJGPP port is no longer supported; it will remain in the code base for a while in case
+a volunteer wishes to take it over. If this does not happen, then eventually code for this
+port will be removed.
+
 @node Other Versions
 @appendixsec Other Freely Available @command{awk} Implementations
 @cindex @command{awk}, implementations
@@ -37798,7 +37802,8 @@ cd gawk-@value{VERSION}.@value{PATCHLEVEL}
 
 @item
 @command{gawk} may be built on non-POSIX systems as well. The currently
-supported systems are MS-Windows using DJGPP, MSYS, MinGW, and Cygwin,
+supported systems are MS-Windows using
+MSYS, MinGW, and Cygwin,
 @ifclear FOR_PRINT
 OS/2 using EMX,
 @end ifclear
diff --git a/eval.c b/eval.c
index 48049ae3..36dab2fb 100644
--- a/eval.c
+++ b/eval.c
@@ -220,6 +220,8 @@ load_casetable(void)
 	for (i = 0200; i <= 0377; i++) {
 		if (isalpha(i) && islower(i) && i != toupper(i))
 			casetable[i] = toupper(i);
+		else
+			casetable[i] = i;
 	}
 #endif
 #endif
diff --git a/re.c b/re.c
index 0a156ffc..5049bca6 100644
--- a/re.c
+++ b/re.c
@@ -266,17 +266,17 @@ research(Regexp *rp, char *str, int start,
 		rp->pat.not_bol = 1;
 
 	/*
-	 * Always do dfa search if can; if it fails, then even if
-	 * need_start is true, we won't bother with the regex search.
+	 * Always do dfa search if can; if it fails, we won't bother
+	 * with the regex search.
 	 *
 	 * The dfa matcher doesn't have a no_bol flag, so don't bother
 	 * trying it in that case.
 	 *
-	 * 7/2008: Skip the dfa matcher if need_start. The dfa matcher
-	 * has bugs in certain multibyte cases and it's too difficult
-	 * to try to special case things.
+	 * 7/2016: The dfa matcher can't handle a case where searching
+	 * starts in the middle of a string, so don't bother trying it
+	 * in that case.
 	 */
-	if (rp->dfa && ! no_bol && ! need_start) {
+	if (rp->dfa && ! no_bol && start == 0) {
 		char save;
 		size_t count = 0;
 		struct dfa *superset = dfasuperset(rp->dfareg);
diff --git a/test/ChangeLog b/test/ChangeLog
index 8939b6f4..22a514b5 100644
--- a/test/ChangeLog
+++ b/test/ChangeLog
@@ -1,7 +1,7 @@
 2015-06-17         Arnold D. Robbins     <arnold@skeeve.com>
 
 	* Makefile.am (ofmtstrnum): New test.
-	* ofmtstrnu.awk, ofmtstrnum.ok: New files.
+	* ofmtstrnum.awk, ofmtstrnum.ok: New files.
 
 2016-07-01         Arnold D. Robbins     <arnold@skeeve.com>