From eb62887e97a3be6f4fc8769479a30827163ea775 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Sat, 7 Mar 2015 11:55:58 +0200 Subject: [PATCH 1/2] lisp/dired.el (dired-delete-file): Doc fix. (Bug#20021) --- lisp/ChangeLog | 4 ++++ lisp/dired.el | 15 ++++++++++----- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index a1cf2a07dbe..0e4e463e200 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2015-03-07 Eli Zaretskii + + * dired.el (dired-delete-file): Doc fix. (Bug#20021) + 2015-03-03 Agustín Martín Domingo * textmodes/ispell.el (ispell-aspell-find-dictionary): Make sure diff --git a/lisp/dired.el b/lisp/dired.el index 211f9242e80..1d5a75a2202 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 From 344c6adab932fd329c11d76d7a0fff12d250bba2 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Sat, 7 Mar 2015 15:12:57 +0200 Subject: [PATCH 2/2] Improve MS-Windows build instructions (Bug#19989) nt/INSTALL: Add some more installation instructions for mingw-get users. --- nt/ChangeLog | 5 +++++ nt/INSTALL | 23 ++++++++++++++++++++++- 2 files changed, 27 insertions(+), 1 deletion(-) diff --git a/nt/ChangeLog b/nt/ChangeLog index 861cb18f0b2..e11a923c23c 100644 --- a/nt/ChangeLog +++ b/nt/ChangeLog @@ -1,3 +1,8 @@ +2015-03-07 Eli Zaretskii + + * INSTALL: Add some more installation instructions for mingw-get + users. (Bug#19989) + 2015-02-10 Noam Postavsky * nt/cmdproxy.c (batch_file_p): New function. diff --git a/nt/INSTALL b/nt/INSTALL index c4e190f6f34..f615b1e5c35 100644 --- a/nt/INSTALL +++ b/nt/INSTALL @@ -108,12 +108,33 @@ Windows 9X as well). . 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