master cd89b81ffd 2/4: Merge from origin/emacs-29

[Stefan Kangas]

branch: master
commit cd89b81ffdb860b4e5958fe242720942faaa2940
Merge: dd9459c464 91a9598baf
Author: Stefan Kangas <stefankangas@gmail.com>
Commit: Stefan Kangas <stefankangas@gmail.com>

    Merge from origin/emacs-29
    
    91a9598baf Update project docs and NEWS
    
    # Conflicts:
    #       etc/NEWS
---
 doc/emacs/maintaining.texi | 10 +++++-----
 etc/NEWS.29                | 11 ++++++++++-
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/doc/emacs/maintaining.texi b/doc/emacs/maintaining.texi
index 44e9e1896f..9ebb044652 100644
--- a/doc/emacs/maintaining.texi
+++ b/doc/emacs/maintaining.texi
@@ -1673,16 +1673,16 @@ is known as the @dfn{project root}.
 @cindex project back-end
   Whether a given directory is a root of some project is determined by
 the project-specific infrastructure, known as @dfn{project back-end}.
-Emacs currently supports two such back-ends: VC (@pxref{Version
+Emacs currently supports two such back-ends: VC-aware (@pxref{Version
 Control}), whereby a VCS repository is considered a project; and EDE
 (@pxref{EDE}).  This is expected to be extended in the future to
 support additional types of projects.
 
   Which files do or don't belong to a project is also determined by
-the project back-end.  For example, the VC back-end doesn't consider
-``ignored'' files (@pxref{VC Ignore}) to be part of the project.
-Also, the VC Project back-end considers ``untracked'' files by default.
-That behavior is controllable with the variable
+the project back-end.  For example, the VC-aware back-end doesn't
+consider ``ignored'' files (@pxref{VC Ignore}) to be part of the
+project.  Also, the VC-aware Project back-end considers ``untracked''
+files by default.  That behavior is controllable with the variable
 @code{project-vc-include-untracked}.
 
 @menu
diff --git a/etc/NEWS.29 b/etc/NEWS.29
index 4e091a5fed..04d8c6948e 100644
--- a/etc/NEWS.29
+++ b/etc/NEWS.29
@@ -2224,7 +2224,7 @@ underlying shell instead of using the normal Emacs 
bindings.
 also handle ANSI codes for faint, italic and blinking text, displaying
 it with new 'term-{faint,italic,slow-blink,fast-blink}' faces.
 
-** Xref
+** Project
 
 +++
 *** 'project-find-file' and 'project-or-external-find-file' now accept
@@ -2239,6 +2239,15 @@ This command displays a list of buffers from the current 
project.
 Customize the user option 'project-kill-buffers-display-buffer-list'
 to enable the display of the buffer list.
 
+*** New user option 'project-vc-extra-root-markers'
+Use it to add detection of nested projects (inside a VCS repository),
+or projects outside of VCS repositories.
+
+As a consequence, the 'VC project backend' is formally renamed to
+'VC-aware project backend'.
+
+** Xref
+
 +++
 *** New command 'xref-go-forward'.
 It is bound to 'C-M-,' and jumps to the location where 'xref-go-back'