Merge from origin/emacs-24

344c6ad Improve MS-Windows build instructions  (Bug#19989)
eb62887 lisp/dired.el (dired-delete-file): Doc fix.  (Bug#20021)

Conflicts:
	lisp/ChangeLog
	nt/ChangeLog

4 files changed, 47 insertions, 6 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ed28911497a..fd7dcd31ffd 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,6 @@
+2015-03-09  Eli Zaretskii  <eliz@gnu.org>
+
+        * dired.el (dired-delete-file): Doc fix.  (Bug#20021)
 2015-03-06  Sergio Durigan Junior  <sergiodj@sergiodj.net>
             Thomas Fitzsimmons  <fitzsim@fitzsim.org>
 
diff --git a/lisp/dired.el b/lisp/dired.el
index 2b3e7832166..cc16c8c9c53 100644
--- a/lisp/dired.el
+++ b/lisp/dired.el
@@ -2850,11 +2850,16 @@ Any other value means to ask for each directory."
 ;; to e.g. recursive-delete-file and put it somewhere else.
 (defun dired-delete-file (file &optional recursive trash) "\
 Delete FILE or directory (possibly recursively if optional RECURSIVE is true.)
-RECURSIVE determines what to do with a non-empty directory.  If RECURSIVE is:
-nil, do not delete.
-`always', delete recursively without asking.
-`top', ask for each directory at top level.
-Anything else, ask for each sub-directory."
+RECURSIVE determines what to do with a non-empty directory.  The effect of
+its possible values is:
+
+  nil           -- do not delete.
+  `always'      -- delete recursively without asking.
+  `top'         -- ask for each directory at top level.
+  Anything else -- ask for each sub-directory.
+
+TRASH non-nil means to trash the file instead of deleting, provided
+`delete-by-moving-to-trash' (which see) is non-nil."
   ;; This test is equivalent to
   ;; (and (file-directory-p fn) (not (file-symlink-p fn)))
   ;; but more efficient
diff --git a/nt/ChangeLog b/nt/ChangeLog
index cc77b18adba..78630415c6f 100644
--- a/nt/ChangeLog
+++ b/nt/ChangeLog
@@ -1,3 +1,15 @@
+2015-03-09  Eli Zaretskii  <eliz@gnu.org>
+
+        * INSTALL: Add some more installation instructions for mingw-get
+        users.  (Bug#19989)
+
+2015-03-09  Noam Postavsky  <npostavs@users.sourceforget.net>
+
+        * nt/cmdproxy.c (batch_file_p): New function.
+        (spawn): If calling a quoted batch file pass NULL for progname.
+        (Bug#18745)
+
+2015-03-09  Eli Zaretskii  <eliz@gnu.org>
 2015-03-03  Eli Zaretskii  <eliz@gnu.org>
 
         * cmdproxy.c (get_next_token): Don't make backslashes disappear
diff --git a/nt/INSTALL b/nt/INSTALL
index 58fe9477251..da150407b39 100644
--- a/nt/INSTALL
+++ b/nt/INSTALL
@@ -108,12 +108,33 @@ build will run on Windows 9X and newer systems).
    . msys-base
    . mingw-developer-toolkit
 
+  When the installation ends, perform the post-installation steps
+  described on this page of the MinGW site:
+
+    http://www.mingw.org/wiki/Getting_Started
+
+  in the "After Installing You Should ..." section.  These steps are
+  important for making your installation complete, and in particular
+  will produce a desktop shortcut for running the MSYS Bash shell,
+  from which you will configure and build Emacs.  Once you've made the
+  shortcut, double-click on it to open the MSYS Bash shell window,
+  where you will proceed with the rest of these instructions.
+
+  In addition, we suggest to modify your system-wide Path variable to
+  include the 'bin' subdirectory of your top-level MinGW installation
+  directory, the one you specified to mingw-get ("C:\MinGW" by
+  default).  This will allow you to invoke the MinGW development
+  tools, like GCC, from the Windows cmd.exe shell windows or from
+  other Windows programs (including Emacs, after you build and install
+  it).
+
   (We recommend that you refrain from installing the MSYS Texinfo
   package, which is part of msys-base, because it might produce mixed
   EOL format when installing Info files.  Instead, install the MinGW
   port of Texinfo, see the ezwinports URL below.  To uninstall the
   MSYS Texinfo, after installing it as part of msys-base, invoke the
-  command "mingw-get remove msys-texinfo".)
+  command "mingw-get remove msys-texinfo", or mark "msys-texinfo" for
+  removal in the mingw-get GUI, then select Installation->Apply Changes.)
 
   At this point, you should be ready to configure and build Emacs in
   its basic configuration.  Skip to the "Generating the configure