Merge from savannah/emacs-30

dcf3916e558 ; Doc fix for legacy keymap functions
227db70db98 ; * doc/misc/ede.texi (Top): Improve introduction.

2 files changed, 15 insertions, 3 deletions

diff --git a/doc/lispref/keymaps.texi b/doc/lispref/keymaps.texi
index 76c5528952d..61e7398067a 100644
--- a/doc/lispref/keymaps.texi
+++ b/doc/lispref/keymaps.texi
@@ -1844,6 +1844,8 @@ local keymap, or @code{nil} if it is undefined there.
 
 The argument @var{accept-defaults} controls checking for default bindings,
 as in @code{lookup-key} (above).
+
+Use @code{keymap-local-lookup} instead of this function.
 @end defun
 
 @defun global-key-binding key &optional accept-defaults
@@ -1852,6 +1854,8 @@ current global keymap, or @code{nil} if it is undefined there.
 
 The argument @var{accept-defaults} controls checking for default bindings,
 as in @code{lookup-key} (above).
+
+Use @code{keymap-global-lookup} instead of this function.
 @end defun
 
 @defun event-convert-list list
diff --git a/doc/misc/ede.texi b/doc/misc/ede.texi
index 6b7f8700300..dc1845dc276 100644
--- a/doc/misc/ede.texi
+++ b/doc/misc/ede.texi
@@ -71,14 +71,22 @@ modify this GNU manual.''
 @top EDE
 @comment  node-name,  next,  previous,  up
 
-@ede{} is the Emacs Development Environment: an Emacs extension that
-simplifies building and debugging programs in Emacs.  It attempts to
-emulate a typical IDE (Integrated Development Environment).  @ede{}
+@ede{} (Emacs Development Environment) is an Emacs extension that
+simplifies building and debugging programs in Emacs.  @ede{}
 can manage or create your makefiles and other building environment
 duties, allowing you to concentrate on writing code rather than
 support files.  It aims to make it much easier for new programmers to
 learn and adopt GNU ways of doing things.
 
+In contrast to Emacs's built-in ``project'' support (@pxref{Projects,,,
+emacs, GNU Emacs Manual}), which provides lightweight project management
+features focused on file navigation and search, @ede{} offers a
+structured approach to managing build systems, configuration files, and
+project metadata.  While built-in projects are well-suited to
+general-purpose workflows, @ede{} is useful for projects using tools
+like @samp{make}, @samp{automake}, or @samp{autoconf}, or that involve
+managing multiple targets, include paths, and build configurations.
+
 @ifnottex
 @insertcopying
 @end ifnottex