Merge branch 'trunk' into xwidget

Conflicts:
	src/window.c

2 files changed, 10 insertions, 0 deletions

diff --git a/nt/ChangeLog b/nt/ChangeLog
index baa7003f5ae..1a0746b3181 100644
--- a/nt/ChangeLog
+++ b/nt/ChangeLog
@@ -1,3 +1,8 @@
+2013-06-25  Juanma Barranquero  <lekktu@gmail.com>
+
+        * configure.bat: Add warning to the help text about using the
+        MSYS/MinGW building procedure.
+
 2013-06-07  Eli Zaretskii  <eliz@gnu.org>
 
         * INSTALL.MSYS: mingw-get is not a GUI program (yet).
diff --git a/nt/configure.bat b/nt/configure.bat
index f833da72269..484fb83d901 100755
--- a/nt/configure.bat
+++ b/nt/configure.bat
@@ -174,6 +174,11 @@ echo. Note that this capability of processing parameters that include the =
 echo. character depends on command extensions.  This batch file attempts to

 echo. enable command extensions.  If command extensions cannot be enabled, a

 echo. warning message will be displayed.

+echo.

+echo. IMPORTANT: This method of building Emacs for MS-Windows is deprecated,

+echo. and could be removed in a future version of Emacs.  The preferred way

+echo  to build Emacs for MS-Windows from now on is using the MSYS environment

+echo. and MinGW development tools.  Please see nt/INSTALL.MSYS for details.

 goto end

 

 rem ----------------------------------------------------------------------