(js--continued-expression-p): Special-case unary plus and minus

[gnu-emacs] / config.bat

diff --git a/config.bat b/config.bat
index 232beb221f75f87eff522f0ea604b0914587b04a..04fce0f29881190d776ac1c086d9edcc4d4ff12e 100644 (file)
--- a/config.bat
+++ b/config.bat
@@ -1,7 +1,7 @@
 @echo off\r
 rem   ----------------------------------------------------------------------\r
 rem   Configuration script for MSDOS\r
-rem   Copyright (C) 1994-1999, 2001-2015 Free Software Foundation, Inc.\r
+rem   Copyright (C) 1994-1999, 2001-2016 Free Software Foundation, Inc.\r
 \r
 rem   This file is part of GNU Emacs.\r
 \r
@@ -22,10 +22,10 @@ rem   ----------------------------------------------------------------------
 rem   YOU'LL NEED THE FOLLOWING UTILITIES TO MAKE EMACS:\r
 rem\r
 rem   + msdos version 3 or better.\r
-rem   + DJGPP version 2.0 or later (version 2.03 or later recommended).\r
+rem   + DJGPP version 2.02 or later (version 2.03 or later recommended).\r
 rem   + make utility that allows breaking of the 128 chars limit on\r
 rem     command lines.  ndmake (as of version 4.5) won't work due to a\r
-rem     line length limit.  The make that comes with DJGPP does work (and is\r
+rem     line length limit.  The DJGPP port of make works (and is\r
 rem     recommended).\r
 rem   + rm, mv, and cp (from GNU file utilities).\r
 rem   + sed (you can use the port that comes with DJGPP).\r
@@ -109,7 +109,7 @@ Goto End
 :djgppOk\r
 echo int main()           >junk.c\r
 echo #ifdef __DJGPP__    >>junk.c\r
-echo {return (__DJGPP__)*10;} >>junk.c\r
+echo {return (__DJGPP__)*10 + (__DJGPP_MINOR__);} >>junk.c\r
 echo #else               >>junk.c\r
 echo #ifdef __GO32__     >>junk.c\r
 echo {return 10;}         >>junk.c\r
@@ -126,8 +126,8 @@ Echo To compile 'Emacs' under MS-DOS you MUST have DJGPP installed!
 Goto End\r
 :go32Ok\r
 set djgpp_ver=2\r
-If Not ErrorLevel 20 Echo To build 'Emacs' you need DJGPP v2.0 or later!\r
-If Not ErrorLevel 20 Goto End\r
+If Not ErrorLevel 22 Echo To build 'Emacs' you need DJGPP v2.02 or later!\r
+If Not ErrorLevel 22 Goto End\r
 rm -f junk.c junk junk.exe\r
 rem DJECHO is used by the top-level Makefile in the v2.x build\r
 Echo Checking whether 'djecho' is available...\r
@@ -135,7 +135,6 @@ redir -o Nul -eo djecho -o junk.$$$ foo
 If Exist junk.$$$ Goto djechoOk\r
 Echo To build 'Emacs' you need the 'djecho.exe' program!\r
 Echo 'djecho.exe' is part of 'djdevNNN.zip' basic DJGPP development kit.\r
-Echo Versions of DJGPP before 2.02 called this program 'echo.exe'.\r
 Echo Either unpack 'djecho.exe' from the 'djdevNNN.zip' archive,\r
 Echo or, if you have 'echo.exe', copy it to 'djecho.exe'.\r
 Echo Then run CONFIG.BAT again with the same arguments you did now.\r