Merge from origin/emacs-29

6c00d126e7f Remove remaining mentions of 'eval-current-buffer'
1073e96170b ; * doc/lispref/text.texi (Database): Fix a typo.  (Bug#6...
b1e68a33d89 Update to Org 9.6-61-g63e073f
dad73e4de19 ; Review and fix NEWS and related documentation
72786ae237e ; Restore ARGS argument in c-ts-mode--fontify-declarator
940ab2423ca ; Always consider :lisp-dir when locating main file of VC...
9ab98cd42aa Add heuristic to locate lisp code in source packages
dda011c78d1 ; * doc/lispref/parsing.texi (Tree-sitter major modes): F...
d62b634d8fc ; * src/process.c (Fprocess_running_child_p): Doc fix.
f6c5b3d635e ; * doc/lispref/parsing.texi: Add a reminder.
e6c49c0454e ; Fix byte-copmiler warning in c-ts-mode--fontify-declarator
4234033a47a ; * lisp/treesit.el: Add some comments.
79584a206b9 Further generalize treesit-defun functions
a819ca5a93c Generalize treesit-defun functions to "things"
e8b34109eeb Reorder optional arguments to 'package-vc-install'
b38e56d8a98 Handle missing dependencies for source packages
7bc7b6b4dd9 ; Partial revert of f3e7820b
2cec78254ea ; * nt/INSTALL.W64: Fix wording.
ecee3bd4209 ; Fix recent changes in treesit documentation

# Conflicts:
#	etc/NEWS

1 files changed, 21 insertions, 16 deletions

diff --git a/nt/INSTALL.W64 b/nt/INSTALL.W64
index b1f5dabaaff..b543034e479 100644
--- a/nt/INSTALL.W64
+++ b/nt/INSTALL.W64
@@ -31,7 +31,7 @@ build tools for MinGW-w64 -- see https://msys2.org/.
 
 ** Download and install MinGW-w64 and MSYS2
 
-Go to https://msys2.org and follow the instructions. It is not
+Go to https://msys2.org and follow the instructions.  It is not
 necessary to install the packages suggested on those instructions.
 
 ** Download and install the necessary packages
@@ -70,9 +70,9 @@ You now have a complete build environment for Emacs.
 
 * Install Git (optional) and disable autocrlf
 
-If you're going to be building the development version of Emacs from the Git
-repository, and you don't already have Git on your system, you can install it
-in your MSYS2 environment with:
+If you're going to be building the development version of Emacs from
+the Git repository (see below), and you don't already have Git on your
+system, you can install it in your MSYS2 environment with:
 
   pacman -S git
 
@@ -95,19 +95,22 @@ Savannah Emacs site, https://savannah.gnu.org/projects/emacs.
 The Emacs ftp site is located at https://ftp.gnu.org/gnu/emacs/ - download the
 version you want to build and put the file into a location like C:\emacs\,
 then uncompress it with tar.  This will put the Emacs source into a folder like
-C:\emacs\emacs-24.5:
+C:\emacs\emacs-29.1:
 
   cd /c/emacs
-  tar xJf emacs-24.5.tar.xz
+  tar xJf emacs-29.1.tar.xz
 
 ** From the Git repository
 
-To download the Git repository, do something like the following -- this will
-put the Emacs source into C:\emacs\emacs-26:
+To clone the Git repository, do something like the following -- this will
+put the Emacs source into C:\emacs\emacs-master:
 
   mkdir /c/emacs
   cd /c/emacs
-  git clone git://git.sv.gnu.org/emacs.git emacs-26
+  git clone git://git.sv.gnu.org/emacs.git emacs-master
+
+This will produce the development sources, i.e. the master branch of
+the Emacs Git repository, in the directory C:\emacs\emacs-master.
 
 (We recommend using the command shown on Savannah Emacs project page.)
 
@@ -116,11 +119,12 @@ put the Emacs source into C:\emacs\emacs-26:
 Now you're ready to build and install Emacs with autogen, configure, make,
 and make install.
 
-  cd /c/emacs/emacs-26
+  cd /c/emacs/emacs-29.1                  (if building a source tarball)
+  cd /c/emacs/emacs-master                (if building from Git)
 
 ** Run autogen
 
-If you are building the development sources, run autogen to generate the
+If you are building from Git, run autogen to generate the
 configure script (note: this step is not necessary if you are using a
 release source tarball, as the configure file is included):
 
@@ -132,15 +136,16 @@ Now you can run configure, which will build the various Makefiles -- note
 that the example given here is just a simple one - for more information
 on the options available please see the INSTALL file in this directory.
 
-The '--prefix' option specifies a location for the resulting binary files,
-which 'make install' will use - in this example we set it to C:\emacs\emacs-26.
-If a prefix is not specified the files will be put in the standard Unix
-directories located in your C:\msys64 directory, but this is not recommended.
+The '--prefix' option specifies a location for the resulting binary
+files, which 'make install' will use - in this example we set it to
+C:\programs\emacs.  If a prefix is not specified the files will be put
+in the standard Unix directories located in your C:\msys64 directory,
+but this is not recommended.
 
 Note also that we need to disable D-Bus because Emacs does not yet
 support them on Windows.
 
-  ./configure --prefix=/c/emacs/emacs-26 --without-dbus
+  ./configure --prefix=/c/programs/emacs --without-dbus
 
 ** Run make