Merge branch 'main' into emacs-30

2 files changed, 9 insertions, 4 deletions

diff --git a/NEWS.org b/NEWS.org
index f1c380f..eb12d6d 100644
--- a/NEWS.org
+++ b/NEWS.org
@@ -15,6 +15,11 @@
 - compat-30: New functions =find-buffer= and =get-truename-buffer=.
 - compat-30: Add extended =completion-metadata-get= with support for
   =completion-category-overrides= and =completion-extra-properties=.
+- A minimal version of =compat.el= will be part of Emacs 30. Emacs :core packages
+  can directly ~(require 'compat)~ without the ~NOERROR~ flag. Furthermore Compat
+  will not be installed unnecessarily. If a package depending on Emacs 25.1 and
+  Compat 29.1 is installed on Emacs 30.1, Compat 29.1 will not be installed from
+  ELPA, since Emacs 30.1 already provides the required functionality.
 
 * Release of "Compat" Version 29.1.4.4
 
diff --git a/compat.texi b/compat.texi
index 7df5500..7faed33 100644
--- a/compat.texi
+++ b/compat.texi
@@ -132,10 +132,10 @@ newer. Packages which are part of Emacs itself and want to take
 advantage of Compat, can also use @code{(require 'compat)}.  The
 advantage of the inclusion of a minimal Compat in Emacs is that Compat
 will not be installed if you require a version newer or equal than the
-current Emacs version.  For example if a package requires Emacs 25.1
-and Compat 29.1 and is installed on Emacs 30.1, the Compat package
-will not be installed, since Emacs 30.1 itself already provides the
-require functionality.
+current Emacs version.  For example, if a package depending on Emacs
+25.1 and Compat 29.1 is installed on Emacs 30.1, Compat will not be
+pulled in as dependency, since Emacs 30.1 already provides the
+required functionality.
 
 Compat provides replacement functions with extended functionality for
 functions that are already defined, e.g., @code{sort} or @code{assoc}.